From 4631be74027bf2fcaea44c3a30758b2fdcacf6c8 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Mon, 24 Oct 2016 20:29:40 +0000 Subject: [PATCH] Fix mangling of implicit calls to operator-> to only include a single "pt", rather than including an extra one for each level of 'operator->()' invoked. llvm-svn: 285015 --- clang/lib/AST/ItaniumMangle.cpp | 5 ++++- clang/test/CodeGenCXX/mangle.cpp | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/clang/lib/AST/ItaniumMangle.cpp b/clang/lib/AST/ItaniumMangle.cpp index db0df363c0cc..15eb11106a9b 100644 --- a/clang/lib/AST/ItaniumMangle.cpp +++ b/clang/lib/AST/ItaniumMangle.cpp @@ -3735,7 +3735,10 @@ recurse: case Expr::CXXOperatorCallExprClass: { const CXXOperatorCallExpr *CE = cast(E); unsigned NumArgs = CE->getNumArgs(); - mangleOperatorName(CE->getOperator(), /*Arity=*/NumArgs); + // A CXXOperatorCallExpr for OO_Arrow models only semantics, not syntax + // (the enclosing MemberExpr covers the syntactic portion). + if (CE->getOperator() != OO_Arrow) + mangleOperatorName(CE->getOperator(), /*Arity=*/NumArgs); // Mangle the arguments. for (unsigned i = 0; i != NumArgs; ++i) mangleExpression(CE->getArg(i)); diff --git a/clang/test/CodeGenCXX/mangle.cpp b/clang/test/CodeGenCXX/mangle.cpp index 5d757102ed25..8ae67c415ae2 100644 --- a/clang/test/CodeGenCXX/mangle.cpp +++ b/clang/test/CodeGenCXX/mangle.cpp @@ -1111,3 +1111,10 @@ void fn(T, __underlying_type(T)) {} template void fn(E, __underlying_type(E)); // CHECK-LABEL: @_ZN6test552fnINS_1EEEEvT_U3eutS2_ } + +namespace test56 { + struct A { A *operator->(); int n; } a; + template void f(decltype(a->n + N)) {} + // CHECK-LABEL: @_ZN6test561fILi0EEEvDTplptL_ZNS_1aEE1nT_E + template void f<0>(int); +}