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

[Devang Patel]

Author: dpatel
Date: Mon Jul 13 16:48:26 2009
New Revision: 75515

URL: http://llvm.org/viewvc/llvm-project?rev=75515&view=rev
Log:
Use AsmPrinter's Mangler to remove leading '1' from linkage names.


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=75515&r1=75514&r2=75515&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/AsmPrinter.h (original)
+++ llvm/trunk/include/llvm/CodeGen/AsmPrinter.h Mon Jul 13 16:48:26 2009
@@ -242,7 +242,7 @@
     /// special global used by LLVM.  If so, emit it and return true, otherwise
     /// do nothing and return false.
     bool EmitSpecialLLVMGlobal(const GlobalVariable *GV);
-    
+
   public:
     //===------------------------------------------------------------------===//
     /// LEB 128 number encoding.
@@ -333,6 +333,10 @@
     /// 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=75515&r1=75514&r2=75515&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Mon Jul 13 16:48:26 2009
@@ -15,6 +15,7 @@
 #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"
@@ -785,9 +786,11 @@
   AddString(GVDie, dwarf::DW_AT_name, dwarf::DW_FORM_string, Name);
   std::string LinkageName;
   GV.getLinkageName(LinkageName);
-  if (!LinkageName.empty())
+  if (!LinkageName.empty()) {
+    Mangler *Mg = Asm->getMangler();
     AddString(GVDie, dwarf::DW_AT_MIPS_linkage_name, dwarf::DW_FORM_string,
-              LinkageName);
+              Mg ? Mg->makeNameProper(LinkageName) : LinkageName);
+  }
   AddType(DW_Unit, GVDie, GV.getType());
   if (!GV.isLocalToUnit())
     AddUInt(GVDie, dwarf::DW_AT_external, dwarf::DW_FORM_flag, 1);
@@ -856,9 +859,11 @@
   std::string LinkageName;
   SP.getLinkageName(LinkageName);
 
-  if (!LinkageName.empty())
+  if (!LinkageName.empty()) {
+    Mangler *Mg = Asm->getMangler();
     AddString(SPDie, dwarf::DW_AT_MIPS_linkage_name, dwarf::DW_FORM_string,
-              LinkageName);
+              Mg ? Mg->makeNameProper(LinkageName) : LinkageName);
+  }
 
   AddSourceLine(SPDie, &SP);