Correctly mangle function names when they are used as part of a

constant pool member's name.
This is intended to address Bug 333.

Also, fix an anachronistic usage of "M" as a parameter of type Function *.

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

diff --git a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
index 0f8c2cdc37433c8975c19f56d24c167e7ed14cfb..cf24c3a1234904c6c8a70b7acd9edb3bfdbce9df 100644 (file)
--- a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
+++ b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
@@ -651,7 +651,7 @@ SparcV9AsmPrinter::printOneOperand(const MachineOperand &mop,
     
     case MachineOperand::MO_ConstantPoolIndex:
       {
-        toAsm << ".CPI_" << currFunction->getName() 
+        toAsm << ".CPI_" << getID(currFunction)
               << "_" << mop.getConstantPoolIndex();
         break;
       }
@@ -663,8 +663,8 @@ SparcV9AsmPrinter::printOneOperand(const MachineOperand &mop,
         
         if (const BasicBlock *BB = dyn_cast<BasicBlock>(Val))
           toAsm << getID(BB);
-        else if (const Function *M = dyn_cast<Function>(Val))
-          toAsm << getID(M);
+        else if (const Function *F = dyn_cast<Function>(Val))
+          toAsm << getID(F);
         else if (const GlobalVariable *GV = dyn_cast<GlobalVariable>(Val))
           toAsm << getID(GV);
         else if (const Constant *CV = dyn_cast<Constant>(Val))