diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2010-02-23 18:25:09 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2010-02-23 18:25:09 +0000 |
| commit | 5370ee2389aa9ba8da3274911003631d66f9f1bd (patch) | |
| tree | 23c48262ce586ee7e90c2ce0acad770e12861893 /lib/CodeGen/Mangle.cpp | |
| parent | b1162f178feb312b452e1b2095e0ed3413ba47fe (diff) | |
Make previous fix handle a few more edge cases.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@96962 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/Mangle.cpp')
| -rw-r--r-- | lib/CodeGen/Mangle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp index 123ce61338..22dbd91259 100644 --- a/lib/CodeGen/Mangle.cpp +++ b/lib/CodeGen/Mangle.cpp @@ -1648,13 +1648,13 @@ bool CXXNameMangler::mangleStandardSubstitution(const NamedDecl *ND) { if (const ClassTemplateSpecializationDecl *SD = dyn_cast<ClassTemplateSpecializationDecl>(ND)) { + if (!isStdNamespace(SD->getDeclContext())) + return false; + // <substitution> ::= Ss # ::std::basic_string<char, // ::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) |