diff options
Diffstat (limited to 'lib/CodeGen/CGDecl.cpp')
| -rw-r--r-- | lib/CodeGen/CGDecl.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index 3935df02df..1eb8539977 100644 --- a/lib/CodeGen/CGDecl.cpp +++ b/lib/CodeGen/CGDecl.cpp @@ -11,7 +11,6 @@ // //===----------------------------------------------------------------------===// -#include "CGCXXABI.h" #include "CGDebugInfo.h" #include "CodeGenFunction.h" #include "CodeGenModule.h" @@ -180,12 +179,10 @@ CodeGenFunction::CreateStaticVarDecl(const VarDecl &D, // Use the label if the variable is renamed with the asm-label extension. std::string Name; - if (D.hasAttr<AsmLabelAttr>()) { - llvm::raw_string_ostream Out(Name); - CGM.getCXXABI().getMangleContext().mangleName(&D, Out); - } else { + if (D.hasAttr<AsmLabelAttr>()) + Name = CGM.getMangledName(&D); + else Name = GetStaticDeclName(*this, D, Separator); - } llvm::Type *LTy = CGM.getTypes().ConvertTypeForMem(Ty); llvm::GlobalVariable *GV = |