s/method/function

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

diff --git a/lib/Bytecode/Writer/WriterInternals.h b/lib/Bytecode/Writer/WriterInternals.h
index 62f12db91fefcecd544ba2652fed149e35638005..73884bbdcc4e1285fc4deb4f121315a81dcd20ba 100644 (file)
--- 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 1d6bfb8033f04aa623ac5f4d2228c0bafcfe42f1..6a51f978931e84157606add02c794eeb933fa12d 100644 (file)
--- 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 8ba6a15ad115d2e242be741fa42d44337b16c82b..a0d43c80b1faff0b471f5927b6b0644b2e6e7ffd 100644 (file)
--- 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 8ba6a15ad115d2e242be741fa42d44337b16c82b..a0d43c80b1faff0b471f5927b6b0644b2e6e7ffd 100644 (file)
--- 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)