diff options
-rw-r--r-- | clang/lib/CodeGen/Mangle.cpp | 4 | ||||
-rw-r--r-- | clang/test/CodeGenCXX/mangle.cpp | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/Mangle.cpp b/clang/lib/CodeGen/Mangle.cpp index 7bdbabc8c07..969670a28d7 100644 --- a/clang/lib/CodeGen/Mangle.cpp +++ b/clang/lib/CodeGen/Mangle.cpp @@ -1546,8 +1546,8 @@ void CXXNameMangler::mangleIntegerLiteral(QualType T, void CXXNameMangler::mangleCalledExpression(const Expr *E, unsigned Arity) { if (E->getType() != getASTContext().OverloadTy) - mangleExpression(E); - // propagate arity to dependent overloads? + return mangleExpression(E); + // FIXME: propagate arity to dependent overloads? llvm::PointerIntPair<OverloadExpr*,1> R = OverloadExpr::find(const_cast<Expr*>(E)); diff --git a/clang/test/CodeGenCXX/mangle.cpp b/clang/test/CodeGenCXX/mangle.cpp index 4152dabc0b4..6636c926ae4 100644 --- a/clang/test/CodeGenCXX/mangle.cpp +++ b/clang/test/CodeGenCXX/mangle.cpp @@ -540,3 +540,20 @@ namespace test16 { static union { struct { union {}; }; }; static union { struct { struct {}; }; }; } + +// rdar://problem/8302148 +namespace test17 { + template <int N> struct A {}; + + struct B { + static int foo(void); + }; + + template <class T> A<sizeof(T::foo())> func(void); + + // CHECK: define i32 @_ZN6test174testEv() + // CHECK: call {{.*}} @_ZN6test174funcINS_1BEEENS_1AIXszclsrT_3fooEEEEv() + int test() { + func<B>(); // { dg-error "sorry, unimplemented" } + } +} |