[llvm-commits] [llvm] r75574 - in /llvm/trunk: include/llvm/CodeGen/AsmPrinter.h lib/CodeGen/AsmPrinter/DwarfDebug.cpp

[Devang Patel]

Author: dpatel
Date: Mon Jul 13 19:55:28 2009
New Revision: 75574

URL: http://llvm.org/viewvc/llvm-project?rev=75574&view=rev
Log:
Do not use Mangler to remove '1' from linkage name.

Modified:
    llvm/trunk/include/llvm/CodeGen/AsmPrinter.h
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

Modified: llvm/trunk/include/llvm/CodeGen/AsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/AsmPrinter.h?rev=75574&r1=75573&r2=75574&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/AsmPrinter.h (original)
+++ llvm/trunk/include/llvm/CodeGen/AsmPrinter.h Mon Jul 13 19:55:28 2009
@@ -333,10 +333,6 @@
     /// debug tables.
     void printDeclare(const MachineInstr *MI) const;
 
-    /// getMangler - Return Mangler used by the AsmPrinter. This is used by
-    /// DWARF debug info generator.
-    Mangler *getMangler() { return Mang; }
-
     /// postInstructionAction - Handling printing of items after the
     /// instruction iteself has been printed (e.g. comments)
     void postInstructionAction(const MachineInstr &MI) const {

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=75574&r1=75573&r2=75574&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Mon Jul 13 19:55:28 2009
@@ -15,7 +15,6 @@
 #include "llvm/Module.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
 #include "llvm/Support/Timer.h"
-#include "llvm/Support/Mangler.h"
 #include "llvm/System/Path.h"
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/TargetRegisterInfo.h"
@@ -786,12 +785,9 @@
   AddString(GVDie, dwarf::DW_AT_name, dwarf::DW_FORM_string, Name);
   std::string LinkageName;
   GV.getLinkageName(LinkageName);
-  if (!LinkageName.empty()) {
-    Mangler *Mg = Asm->getMangler();
-    assert (Mg && "Unable to find Mangler!");
+  if (!LinkageName.empty())
     AddString(GVDie, dwarf::DW_AT_MIPS_linkage_name, dwarf::DW_FORM_string,
-              Mg->makeNameProper(LinkageName));
-  }
+              LinkageName);
   AddType(DW_Unit, GVDie, GV.getType());
   if (!GV.isLocalToUnit())
     AddUInt(GVDie, dwarf::DW_AT_external, dwarf::DW_FORM_flag, 1);
@@ -859,14 +855,9 @@
 
   std::string LinkageName;
   SP.getLinkageName(LinkageName);
-
-  if (!LinkageName.empty()) {
-    Mangler *Mg = Asm->getMangler();
-    assert (Mg && "Unable to find Mangler!");
+  if (!LinkageName.empty())
     AddString(SPDie, dwarf::DW_AT_MIPS_linkage_name, dwarf::DW_FORM_string,
-              Mg->makeNameProper(LinkageName));
-  }
-
+              LinkageName);
   AddSourceLine(SPDie, &SP);
 
   DICompositeType SPTy = SP.getType();