diff options
| -rw-r--r-- | clang/lib/AST/MicrosoftMangle.cpp | 6 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/mangle-ms-templates.cpp | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/clang/lib/AST/MicrosoftMangle.cpp b/clang/lib/AST/MicrosoftMangle.cpp index 64e27f1f4ba..68f57a92129 100644 --- a/clang/lib/AST/MicrosoftMangle.cpp +++ b/clang/lib/AST/MicrosoftMangle.cpp @@ -889,6 +889,9 @@ void MicrosoftCXXNameMangler::mangleTemplateArg(const TemplateDecl *TD, mangleIntegerLiteral(TA.getAsIntegral(), TA.getIntegralType()->isBooleanType()); break; + case TemplateArgument::NullPtr: + Out << "$0A@"; + break; case TemplateArgument::Expression: mangleExpression(TA.getAsExpr()); break; @@ -901,8 +904,7 @@ void MicrosoftCXXNameMangler::mangleTemplateArg(const TemplateDecl *TD, mangleTemplateArg(TD, *I, ArgIndex); break; case TemplateArgument::Template: - case TemplateArgument::TemplateExpansion: - case TemplateArgument::NullPtr: { + case TemplateArgument::TemplateExpansion: { // Issue a diagnostic. DiagnosticsEngine &Diags = Context.getDiags(); unsigned DiagID = Diags.getCustomDiagID(DiagnosticsEngine::Error, diff --git a/clang/test/CodeGenCXX/mangle-ms-templates.cpp b/clang/test/CodeGenCXX/mangle-ms-templates.cpp index 363583a65f4..6e5be658242 100644 --- a/clang/test/CodeGenCXX/mangle-ms-templates.cpp +++ b/clang/test/CodeGenCXX/mangle-ms-templates.cpp @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s -// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft -triple=x86_64-pc-win32 | FileCheck -check-prefix X64 %s +// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s +// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -cxx-abi microsoft -triple=x86_64-pc-win32 | FileCheck -check-prefix X64 %s template<typename T> class Class { @@ -156,3 +156,8 @@ void variadic_class_instantiate() { } // CHECK: call {{.*}} @"\01??0?$VariadicClass@HD_N@@QAE@XZ" // CHECK: call {{.*}} @"\01??0?$VariadicClass@_NDH@@QAE@XZ" + +// PR16788 +template <decltype(nullptr)> struct S1 {}; +void f(S1<nullptr>) {} +// CHECK: "\01?f@@YAXU?$S1@$0A@@@@Z" |
