fixup! restore condition; mark "pm" as Named

Author: Michael137

libcxxabi/src/demangle/ItaniumDemangle.h

@@ -3389,8 +3389,10 @@ const typename AbstractManglingParser<
     {"de", OperatorInfo::Prefix, false, Node::Prec::Unary, "operator*"},
     {"dl", OperatorInfo::Del, /*Ary*/ false, Node::Prec::Unary,
      "operator delete"},
-    {"ds", OperatorInfo::Member, false, Node::Prec::PtrMem, "operator.*"},
-    {"dt", OperatorInfo::Member, false, Node::Prec::Postfix, "operator."},
+    {"ds", OperatorInfo::Member, /*Named*/ false, Node::Prec::PtrMem,
+     "operator.*"},
+    {"dt", OperatorInfo::Member, /*Named*/ false, Node::Prec::Postfix,
+     "operator."},
     {"dv", OperatorInfo::Binary, false, Node::Prec::Assign, "operator/"},
     {"eO", OperatorInfo::Binary, false, Node::Prec::Assign, "operator^="},
     {"eo", OperatorInfo::Binary, false, Node::Prec::Xor, "operator^"},
@@ -3419,10 +3421,12 @@ const typename AbstractManglingParser<
     {"or", OperatorInfo::Binary, false, Node::Prec::Ior, "operator|"},
     {"pL", OperatorInfo::Binary, false, Node::Prec::Assign, "operator+="},
     {"pl", OperatorInfo::Binary, false, Node::Prec::Additive, "operator+"},
-    {"pm", OperatorInfo::Member, false, Node::Prec::PtrMem, "operator->*"},
+    {"pm", OperatorInfo::Member, /*Named*/ true, Node::Prec::PtrMem,
+     "operator->*"},
     {"pp", OperatorInfo::Postfix, false, Node::Prec::Postfix, "operator++"},
     {"ps", OperatorInfo::Prefix, false, Node::Prec::Unary, "operator+"},
-    {"pt", OperatorInfo::Member, false, Node::Prec::Postfix, "operator->"},
+    {"pt", OperatorInfo::Member, /*Named*/ true, Node::Prec::Postfix,
+     "operator->"},
     {"qu", OperatorInfo::Conditional, false, Node::Prec::Conditional,
      "operator?"},
     {"rM", OperatorInfo::Binary, false, Node::Prec::Assign, "operator%="},
@@ -3495,6 +3499,9 @@ AbstractManglingParser<Derived, Alloc>::parseOperatorName(NameState *State) {
     if (Op->getKind() >= OperatorInfo::Unnameable)
       /* Not a nameable operator.  */
       return nullptr;
+    if (Op->getKind() == OperatorInfo::Member && !Op->getFlag())
+      /* Not a nameable MemberExpr */
+      return nullptr;
 
     return make<NameType>(Op->getName());
   }

libcxxabi/test/test_demangle.pass.cpp

@@ -30248,8 +30248,6 @@ const char* cases[][2] = {
     {"_Z3fooIPU9__ptrauthILj1ELb0ELj64EEPiEvT_", "void foo<int* __ptrauth<1u, false, 64u>*>(int* __ptrauth<1u, false, 64u>*)"},
 
     {"_ZN1CpmEi", "C::operator->*(int)"},
-    {"_ZN1CdtEi", "C::operator.(int)"},
-    {"_ZN1CdsEi", "C::operator.*(int)"},
     // clang-format on
 };
 
@@ -30353,6 +30351,8 @@ const char *invalid_cases[] = {
     "_ZGI3Foo",
     "_ZGIW3Foov",
     "W1x",
+    "_ZN1CdtEi",
+    "_ZN1CdsEi",
     // clang-format on
 };
 

llvm/include/llvm/Demangle/ItaniumDemangle.h

@@ -3389,8 +3389,10 @@ const typename AbstractManglingParser<
     {"de", OperatorInfo::Prefix, false, Node::Prec::Unary, "operator*"},
     {"dl", OperatorInfo::Del, /*Ary*/ false, Node::Prec::Unary,
      "operator delete"},
-    {"ds", OperatorInfo::Member, false, Node::Prec::PtrMem, "operator.*"},
-    {"dt", OperatorInfo::Member, false, Node::Prec::Postfix, "operator."},
+    {"ds", OperatorInfo::Member, /*Named*/ false, Node::Prec::PtrMem,
+     "operator.*"},
+    {"dt", OperatorInfo::Member, /*Named*/ false, Node::Prec::Postfix,
+     "operator."},
     {"dv", OperatorInfo::Binary, false, Node::Prec::Assign, "operator/"},
     {"eO", OperatorInfo::Binary, false, Node::Prec::Assign, "operator^="},
     {"eo", OperatorInfo::Binary, false, Node::Prec::Xor, "operator^"},
@@ -3419,10 +3421,12 @@ const typename AbstractManglingParser<
     {"or", OperatorInfo::Binary, false, Node::Prec::Ior, "operator|"},
     {"pL", OperatorInfo::Binary, false, Node::Prec::Assign, "operator+="},
     {"pl", OperatorInfo::Binary, false, Node::Prec::Additive, "operator+"},
-    {"pm", OperatorInfo::Member, false, Node::Prec::PtrMem, "operator->*"},
+    {"pm", OperatorInfo::Member, /*Named*/ true, Node::Prec::PtrMem,
+     "operator->*"},
     {"pp", OperatorInfo::Postfix, false, Node::Prec::Postfix, "operator++"},
     {"ps", OperatorInfo::Prefix, false, Node::Prec::Unary, "operator+"},
-    {"pt", OperatorInfo::Member, false, Node::Prec::Postfix, "operator->"},
+    {"pt", OperatorInfo::Member, /*Named*/ true, Node::Prec::Postfix,
+     "operator->"},
     {"qu", OperatorInfo::Conditional, false, Node::Prec::Conditional,
      "operator?"},
     {"rM", OperatorInfo::Binary, false, Node::Prec::Assign, "operator%="},
@@ -3495,6 +3499,9 @@ AbstractManglingParser<Derived, Alloc>::parseOperatorName(NameState *State) {
     if (Op->getKind() >= OperatorInfo::Unnameable)
       /* Not a nameable operator.  */
       return nullptr;
+    if (Op->getKind() == OperatorInfo::Member && !Op->getFlag())
+      /* Not a nameable MemberExpr */
+      return nullptr;
 
     return make<NameType>(Op->getName());
   }