diff options
| -rw-r--r-- | clang/lib/AST/ItaniumMangle.cpp | 11 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/mangle.cpp | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/clang/lib/AST/ItaniumMangle.cpp b/clang/lib/AST/ItaniumMangle.cpp index 5a1025fff02..5b247f2cdd9 100644 --- a/clang/lib/AST/ItaniumMangle.cpp +++ b/clang/lib/AST/ItaniumMangle.cpp @@ -2669,15 +2669,8 @@ recurse: else if (const TemplateTemplateParmDecl *TempTP = dyn_cast<TemplateTemplateParmDecl>(Pack)) mangleTemplateParameter(TempTP->getIndex()); - else { - // Note: proposed by Mike Herrick on 11/30/10 - // <expression> ::= sZ <function-param> # size of function parameter pack - Diagnostic &Diags = Context.getDiags(); - unsigned DiagID = Diags.getCustomDiagID(Diagnostic::Error, - "cannot mangle sizeof...(function parameter pack)"); - Diags.Report(DiagID); - return; - } + else + mangleFunctionParam(cast<ParmVarDecl>(Pack)); break; } diff --git a/clang/test/CodeGenCXX/mangle.cpp b/clang/test/CodeGenCXX/mangle.cpp index 0f4e5c5c382..0b3ba639afd 100644 --- a/clang/test/CodeGenCXX/mangle.cpp +++ b/clang/test/CodeGenCXX/mangle.cpp @@ -839,3 +839,13 @@ namespace test35 { // CHECK: define weak_odr void @_ZN6test352f1INS_1AEEEvDTszadsrT_plIiEE template void f1<A>(__SIZE_TYPE__); } + +namespace test36 { + template<unsigned> struct A { }; + + template<typename ...Types> + auto f1(Types... values) -> A<sizeof...(values)> { } + + // CHECK: define weak_odr {{.*}} @_ZN6test362f1IJifEEENS_1AIXsZfp_EEEDpT_ + template A<2> f1(int, float); +} |
