diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2010-02-23 18:20:18 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2010-02-23 18:20:18 +0000 |
| commit | b1162f178feb312b452e1b2095e0ed3413ba47fe (patch) | |
| tree | da4d6e2923224779c8b4a07ad44695fb3d432284 | |
| parent | 18da88a38b82132faa7794120e17352dfacc5155 (diff) | |
PR6400: Handle an extreme edge case in mangling correctly.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@96961 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/Mangle.cpp | 3 | ||||
| -rw-r--r-- | test/CodeGenCXX/mangle-subst-std.cpp | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp index a302225c7f..123ce61338 100644 --- a/lib/CodeGen/Mangle.cpp +++ b/lib/CodeGen/Mangle.cpp @@ -1652,6 +1652,9 @@ bool CXXNameMangler::mangleStandardSubstitution(const NamedDecl *ND) { // ::std::char_traits<char>, // ::std::allocator<char> > if (SD->getIdentifier()->isStr("basic_string")) { + if (!isStdNamespace(SD->getDeclContext())) + return false; + const TemplateArgumentList &TemplateArgs = SD->getTemplateArgs(); if (TemplateArgs.size() != 3) diff --git a/test/CodeGenCXX/mangle-subst-std.cpp b/test/CodeGenCXX/mangle-subst-std.cpp index 913c8f101b..062610bd74 100644 --- a/test/CodeGenCXX/mangle-subst-std.cpp +++ b/test/CodeGenCXX/mangle-subst-std.cpp @@ -55,3 +55,9 @@ namespace std terminate_handler set_terminate(terminate_handler) { return 0; } } } + +// Make sure we don't treat the following like std::string +// CHECK: define void @_Z1f12basic_stringIcSt11char_traitsIcESaIcEE +template<typename, typename, typename> struct basic_string { }; +typedef basic_string<char, std::char_traits<char>, std::allocator<char> > not_string; +void f(not_string) { } |