Clean up interface to getGlobalLinkName.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@31001 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h
index 8f73ce7f6c8782c734623fd8e8d805ad60564087..68ca2d0e32a8bfa8c04cf5066febb99d86da4033 100644 (file)
--- a/include/llvm/CodeGen/AsmPrinter.h
+++ b/include/llvm/CodeGen/AsmPrinter.h
@@ -103,8 +103,7 @@ namespace llvm {
     /// getGlobalLinkName - Returns the asm/link name of of the specified
     /// global variable.  Should be overridden by each target asm printer to
     /// generate the appropriate value.
-    virtual void getGlobalLinkName(const GlobalVariable *GV,
-                                   std::string &LinkName);
+    virtual const std::string getGlobalLinkName(const GlobalVariable *GV) const;
 
   protected:
     /// doInitialization - Set up the AsmPrinter when we are working on a new

diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp
index e9542fc6c1381ed8a1edb4c065c55690d25db29c..90d77adfb3ef2e51873bcf8deef700e220a1c397 100644 (file)
--- a/lib/CodeGen/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter.cpp
@@ -352,11 +352,12 @@ unsigned AsmPrinter::getPreferredAlignmentLog(const GlobalVariable *GV) const {
 /// getGlobalLinkName - Returns the asm/link name of of the specified
 /// global variable.  Should be overridden by each target asm printer to
 /// generate the appropriate value.
-void AsmPrinter::getGlobalLinkName(const GlobalVariable *GV,
-                                  std::string &LinkName) {
+const std::string AsmPrinter::getGlobalLinkName(const GlobalVariable *GV) const{
+  std::string LinkName;
   // Default action is to use a global symbol.                              
   LinkName = TAI->getGlobalPrefix();
   LinkName += GV->getName();
+  return LinkName;
 }
 
 // EmitAlignment - Emit an alignment directive to the specified power of two.

diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index 1c52c5bf5d1596062ebf53020b13fe39d91d4e7f..1d08d07a8a351629e4ea0c667507ad5657cadfb8 100644 (file)
--- a/lib/CodeGen/DwarfWriter.cpp
+++ b/lib/CodeGen/DwarfWriter.cpp
@@ -1634,8 +1634,7 @@ DIE *DwarfWriter::NewGlobalVariable(GlobalVariableDesc *GVD) {
   AddSourceLine(VariableDie, UnitDesc, GVD->getLine());
   
   // Work up linkage name.
-  std::string LinkageName;
-  Asm->getGlobalLinkName(GV, LinkageName);
+  const std::string LinkageName = Asm->getGlobalLinkName(GV);
 
   // Add address.
   DIEBlock *Block = new DIEBlock();