eliminate a form of PrintLabelName.

llvm-svn: 97999

3 files changed, 5 insertions, 11 deletions

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 602145bbddd..633d586e564 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -2969,7 +2969,7 @@ void DwarfDebug::emitDebugInlineInfo() {
       else
         O << MAI->getData64bitsDirective();
 
-      PrintLabelName("label", LI->first); EOL("low_pc");
+      PrintLabelName(getDWLabel("label", LI->first)); EOL("low_pc");
     }
   }
 
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp
index 68046284e20..fcef94eb64c 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp
@@ -219,11 +219,6 @@ void DwarfPrinter::PrintLabelName(const MCSymbol *Label) const {
   O << Label->getName();
 }
 
-void DwarfPrinter::PrintLabelName(const char *Tag, unsigned Number) const {
-  // FIXME: REMOVE.
-  O << MAI->getPrivateGlobalPrefix() << Tag;
-  if (Number) O << Number;
-}
 void DwarfPrinter::PrintLabelName(const char *Tag, unsigned Number,
                                   const char *Suffix) const {
   // FIXME: REMOVE.
@@ -291,9 +286,9 @@ void DwarfPrinter::EmitDifference(const char *TagHi, unsigned NumberHi,
     O << "\t.set\t";
     PrintLabelName("set", SetCounter, Flavor);
     O << ",";
-    PrintLabelName(TagHi, NumberHi);
+    PrintLabelName(getDWLabel(TagHi, NumberHi));
     O << "-";
-    PrintLabelName(TagLo, NumberLo);
+    PrintLabelName(getDWLabel(TagLo, NumberLo));
     O << "\n";
     
     PrintRelDirective(IsSmall);
@@ -301,9 +296,9 @@ void DwarfPrinter::EmitDifference(const char *TagHi, unsigned NumberHi,
     ++SetCounter;
   } else {
     PrintRelDirective(IsSmall);
-    PrintLabelName(TagHi, NumberHi);
+    PrintLabelName(getDWLabel(TagHi, NumberHi));
     O << "-";
-    PrintLabelName(TagLo, NumberLo);
+    PrintLabelName(getDWLabel(TagLo, NumberLo));
   }
 }
 
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.h b/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.h
index 3c9d555f3f9..c4b9497bb53 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.h
@@ -125,7 +125,6 @@ public:
   /// PrintLabelName - Print label name in form used by Dwarf writer.
   ///
   void PrintLabelName(const MCSymbol *Label) const;
-  void PrintLabelName(const char *Tag, unsigned Number) const;
   void PrintLabelName(const char *Tag, unsigned Number,
                       const char *Suffix) const;