[llvm-commits] CVS: llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp

[Brian Gaeke]

Changes in directory llvm/lib/Target/SparcV9:

SparcV9AsmPrinter.cpp updated: 1.110 -> 1.111

---
Log message:

Correctly mangle function names when they are used as part of a
constant pool member's name.
This is intended to address Bug 333: http://llvm.cs.uiuc.edu/PR333 .

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


---
Diffs of the changes:  (+3 -3)

Index: llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.110 llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.111
--- llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.110	Sun Apr 25 02:04:49 2004
+++ llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp	Tue May  4 16:09:02 2004
@@ -651,7 +651,7 @@
     
     case MachineOperand::MO_ConstantPoolIndex:
       {
-        toAsm << ".CPI_" << currFunction->getName() 
+        toAsm << ".CPI_" << getID(currFunction)
               << "_" << mop.getConstantPoolIndex();
         break;
       }
@@ -663,8 +663,8 @@
         
         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))