[demangler] Fold expressions of .* and ->*
(Exitingly) a fold expression's operators include .* and ->*, but we
failed to demangle them as we categorize those as MemberExprs, not
BinaryExprs.
Reviewed By: dblaikie
Differential Revision: https://reviews.llvm.org/D123305
GitOrigin-RevId: ed2d4da732006d76e2f7b4315a2056b2d7b2f15c
diff --git a/src/demangle/ItaniumDemangle.h b/src/demangle/ItaniumDemangle.h
index a504b06..7893cb0 100644
--- a/src/demangle/ItaniumDemangle.h
+++ b/src/demangle/ItaniumDemangle.h
@@ -4447,7 +4447,11 @@
++First;
const auto *Op = parseOperatorEncoding();
- if (!Op || Op->getKind() != OperatorInfo::Binary)
+ if (!Op)
+ return nullptr;
+ if (!(Op->getKind() == OperatorInfo::Binary
+ || (Op->getKind() == OperatorInfo::Member
+ && Op->getName().back() == '*')))
return nullptr;
Node *Pack = getDerived().parseExpr();
diff --git a/test/test_demangle.pass.cpp b/test/test_demangle.pass.cpp
index 172f15f..b0295ce 100644
--- a/test/test_demangle.pass.cpp
+++ b/test/test_demangle.pass.cpp
@@ -29963,6 +29963,8 @@
"void Partial<1, 2>::foldr<3, 4>(A<1 + (2 + ((3, 4) + ... + (1 + (2 + ((3, 4) + ...)))))>)"},
{"_ZN7PartialIJLi1ELi2EEE5foldrIJLi3ELi4EEEEv1AIXplplLi1ELi2EfRplT_plplLi1ELi2EflplT_EE",
"void Partial<1, 2>::foldr<3, 4>(A<1 + 2 + ((3, 4) + ... + (1 + 2 + (... + (3, 4))))>)"},
+ {"_Z1fIXfLpm1x1yEEvv", "void f<(x ->* ... ->* (y...))>()"},
+ {"_Z1fIXfLds1x1yEEvv", "void f<(x .* ... .* (y...))>()"},
// reference collapsing:
{"_Z1fIR1SEiOT_", "int f<S&>(S&)"},
@@ -30173,6 +30175,9 @@
"_ZN1fIiEEvNTUt_E",
"_ZNDTUt_Ev",
+ "_Z1fIXfLpt1x1yEEvv",
+ "_Z1fIXfLdt1x1yEEvv",
+
"_ZN1fIXawLi0EEEEvv",
"_ZNWUt_3FOOEv",