summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/Mangle.cpp
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2010-02-23 18:20:18 +0000
committerEli Friedman <eli.friedman@gmail.com>2010-02-23 18:20:18 +0000
commitad5f0789f68bfd0d5336e40d2cc53bffc3dc05b5 (patch)
tree63e9e8076698e4d270d5971cf78c2d03388a5ea1 /clang/lib/CodeGen/Mangle.cpp
parentf81db146b4669cfb7ebabd3528c7e8b4dd96b7dd (diff)
downloadbcm5719-llvm-ad5f0789f68bfd0d5336e40d2cc53bffc3dc05b5.tar.gz
bcm5719-llvm-ad5f0789f68bfd0d5336e40d2cc53bffc3dc05b5.zip
PR6400: Handle an extreme edge case in mangling correctly.
llvm-svn: 96961
Diffstat (limited to 'clang/lib/CodeGen/Mangle.cpp')
-rw-r--r--clang/lib/CodeGen/Mangle.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/Mangle.cpp b/clang/lib/CodeGen/Mangle.cpp
index a302225c7f7..123ce613387 100644
--- a/clang/lib/CodeGen/Mangle.cpp
+++ b/clang/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)
OpenPOWER on IntegriCloud