commit dc9d5ff58c8353b8f0bc6ea448be2d66e10a50d1
author Erik Pilkington <erik.pilkington@gmail.com> Wed May 13 22:19:45 2020 -0400
committer Copybara-Service <copybara-worker@google.com> Fri Aug 28 01:05:49 2020 -0700
tree 6872e07bea21fa32d2b20f4eb574f5cd91ec7f56
parent 27011a8665d5e6dd087951466d82683ad4162136

[demangler] Support for 'this' expressions

llvm.org/PR45896

GitOrigin-RevId: 1c1fb350c59a9c79078959b2fa15e6d658934a56

src/demangle/ItaniumDemangle.h

diff --git a/src/demangle/ItaniumDemangle.h b/src/demangle/ItaniumDemangle.h
index afef50b..dcece38 100644
--- a/src/demangle/ItaniumDemangle.h
+++ b/src/demangle/ItaniumDemangle.h
@@ -4068,8 +4068,11 @@
 //                  ::= fp <top-level CV-Qualifiers> <parameter-2 non-negative number> _   # L == 0, second and later parameters
 //                  ::= fL <L-1 non-negative number> p <top-level CV-Qualifiers> _         # L > 0, first parameter
 //                  ::= fL <L-1 non-negative number> p <top-level CV-Qualifiers> <parameter-2 non-negative number> _   # L > 0, second and later parameters
+//                  ::= fpT      # 'this' expression (not part of standard?)
 template <typename Derived, typename Alloc>
 Node *AbstractManglingParser<Derived, Alloc>::parseFunctionParam() {
+  if (consumeIf("fpT"))
+    return make<NameType>("this");
   if (consumeIf("fp")) {
     parseCVQualifiers();
     StringView Num = parseNumber();

test/test_demangle.pass.cpp

diff --git a/test/test_demangle.pass.cpp b/test/test_demangle.pass.cpp
index 2df8ea1..c75b697 100644
--- a/test/test_demangle.pass.cpp
+++ b/test/test_demangle.pass.cpp
@@ -29794,6 +29794,8 @@
     {"_ZZ11inline_funcvENKUlTyTyT_T1_T0_E_clIiiiEEDaS_S0_S1_", "auto inline_func()::'lambda'<typename $T, typename $T0>($T, auto, $T0)::operator()<int, int, int>($T, auto, $T0) const"},
 
     {"_Z1fIL4Enumn1EEvv", "void f<(Enum)-1>()"},
+
+    {"_ZN1A1gIiEEDTcldtptfpT1b1fIT_EEEv", "decltype(this->b.f<int>()) A::g<int>()"},
 };
 
 const unsigned N = sizeof(cases) / sizeof(cases[0]);