diff options
| author | Reid Kleckner <reid@kleckner.net> | 2013-04-09 12:47:38 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2013-04-09 12:47:38 +0000 |
| commit | cb5949d1cd6ed8f5e830dd1849a2b786e32e1818 (patch) | |
| tree | 82ddcee6f9048cc74777a54652987abe8feb17c1 | |
| parent | db68e5a1f239d7d6d2348fef7c492ee99a2b8bbc (diff) | |
[ms-cxxabi] Add "$$C" when mangling template arg QualTypes
Credit goes to Timur Iskhodzhanov for finding the problem and solution.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@179093 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/AST/MicrosoftMangle.cpp | 8 | ||||
| -rw-r--r-- | test/CodeGenCXX/mangle-ms-templates.cpp | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/lib/AST/MicrosoftMangle.cpp b/lib/AST/MicrosoftMangle.cpp index 40f8730e61..9cd6bac971 100644 --- a/lib/AST/MicrosoftMangle.cpp +++ b/lib/AST/MicrosoftMangle.cpp @@ -824,9 +824,13 @@ MicrosoftCXXNameMangler::mangleTemplateArgs(const TemplateDecl *TD, switch (TA.getKind()) { case TemplateArgument::Null: llvm_unreachable("Can't mangle null template arguments!"); - case TemplateArgument::Type: - mangleType(TA.getAsType(), SourceRange()); + case TemplateArgument::Type: { + QualType T = TA.getAsType(); + if (T.hasQualifiers()) + Out << "$$C"; + mangleType(T, SourceRange()); break; + } case TemplateArgument::Declaration: mangle(cast<NamedDecl>(TA.getAsDecl()), "$1?"); break; diff --git a/test/CodeGenCXX/mangle-ms-templates.cpp b/test/CodeGenCXX/mangle-ms-templates.cpp index d0e8af4888..7b7f30bb72 100644 --- a/test/CodeGenCXX/mangle-ms-templates.cpp +++ b/test/CodeGenCXX/mangle-ms-templates.cpp @@ -35,6 +35,18 @@ void template_mangling() { c1.method(); // CHECK: call {{.*}} @"\01?method@?$Class@VTypename@@@@QAEXXZ" + Class<const Typename> c1_const; + Class<volatile Typename> c1_volatile; + Class<const volatile Typename> c1_cv; + c1_const.method(); + c1_volatile.method(); + c1_cv.method(); +// Types with qualifiers have an extra $$C escape when used as template +// arguments. Not sure why. +// CHECK: call {{.*}} @"\01?method@?$Class@$$CBVTypename@@@@QAEXXZ" +// CHECK: call {{.*}} @"\01?method@?$Class@$$CCVTypename@@@@QAEXXZ" +// CHECK: call {{.*}} @"\01?method@?$Class@$$CDVTypename@@@@QAEXXZ" + Class<Nested<Typename> > c2; c2.method(); // CHECK: call {{.*}} @"\01?method@?$Class@V?$Nested@VTypename@@@@@@QAEXXZ" |