aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/Bytecode/Writer/WriterInternals.h2
-rw-r--r--lib/CodeGen/MachineInstr.cpp2
-rw-r--r--lib/CodeGen/RegAlloc/RegClass.cpp6
-rw-r--r--lib/Target/SparcV9/RegAlloc/RegClass.cpp6
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/Bytecode/Writer/WriterInternals.h b/lib/Bytecode/Writer/WriterInternals.h
index 62f12db..73884bb 100644
--- a/lib/Bytecode/Writer/WriterInternals.h
+++ b/lib/Bytecode/Writer/WriterInternals.h
@@ -27,7 +27,7 @@ public:
protected:
void outputConstants(bool isMethod);
- void processMethod(const Method *M);
+ void processMethod(const Function *F);
void processBasicBlock(const BasicBlock *BB);
void processInstruction(const Instruction *I);
diff --git a/lib/CodeGen/MachineInstr.cpp b/lib/CodeGen/MachineInstr.cpp
index 1d6bfb8..6a51f97 100644
--- a/lib/CodeGen/MachineInstr.cpp
+++ b/lib/CodeGen/MachineInstr.cpp
@@ -167,7 +167,7 @@ std::ostream &operator<<(std::ostream &os, const MachineOperand &mop)
case MachineOperand::MO_PCRelativeDisp:
{
const Value* opVal = mop.getVRegValue();
- bool isLabel = isa<Method>(opVal) || isa<BasicBlock>(opVal);
+ bool isLabel = isa<Function>(opVal) || isa<BasicBlock>(opVal);
os << "%disp(" << (isLabel? "label " : "addr-of-val ");
if (opVal->hasName())
os << opVal->getName();
diff --git a/lib/CodeGen/RegAlloc/RegClass.cpp b/lib/CodeGen/RegAlloc/RegClass.cpp
index 8ba6a15..a0d43c8 100644
--- a/lib/CodeGen/RegAlloc/RegClass.cpp
+++ b/lib/CodeGen/RegAlloc/RegClass.cpp
@@ -6,9 +6,9 @@ using std::cerr;
// This constructor inits IG. The actual matrix is created by a call to
// createInterferenceGraph() above.
//----------------------------------------------------------------------------
-RegClass::RegClass(const Method *const M,
- const MachineRegClassInfo *const Mrc,
- const ReservedColorListType *const RCL)
+RegClass::RegClass(const Function *M,
+ const MachineRegClassInfo *Mrc,
+ const ReservedColorListType *RCL)
: Meth(M), MRC(Mrc), RegClassID( Mrc->getRegClassID() ),
IG(this), IGNodeStack(), ReservedColorList(RCL) {
if( DEBUG_RA)
diff --git a/lib/Target/SparcV9/RegAlloc/RegClass.cpp b/lib/Target/SparcV9/RegAlloc/RegClass.cpp
index 8ba6a15..a0d43c8 100644
--- a/lib/Target/SparcV9/RegAlloc/RegClass.cpp
+++ b/lib/Target/SparcV9/RegAlloc/RegClass.cpp
@@ -6,9 +6,9 @@ using std::cerr;
// This constructor inits IG. The actual matrix is created by a call to
// createInterferenceGraph() above.
//----------------------------------------------------------------------------
-RegClass::RegClass(const Method *const M,
- const MachineRegClassInfo *const Mrc,
- const ReservedColorListType *const RCL)
+RegClass::RegClass(const Function *M,
+ const MachineRegClassInfo *Mrc,
+ const ReservedColorListType *RCL)
: Meth(M), MRC(Mrc), RegClassID( Mrc->getRegClassID() ),
IG(this), IGNodeStack(), ReservedColorList(RCL) {
if( DEBUG_RA)