[cfe-commits] r145040 - /cfe/trunk/lib/CodeGen/CGDecl.cpp

[Benjamin Kramer]

Author: d0k
Date: Mon Nov 21 09:47:23 2011
New Revision: 145040

URL: http://llvm.org/viewvc/llvm-project?rev=145040&view=rev
Log:
CodeGen: Simplify code.

Modified:
    cfe/trunk/lib/CodeGen/CGDecl.cpp

Modified: cfe/trunk/lib/CodeGen/CGDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDecl.cpp?rev=145040&r1=145039&r2=145040&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDecl.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGDecl.cpp Mon Nov 21 09:47:23 2011
@@ -11,7 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "CGCXXABI.h"
 #include "CGDebugInfo.h"
 #include "CodeGenFunction.h"
 #include "CodeGenModule.h"
@@ -180,12 +179,10 @@
 
   // 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 =