s/Method/Function

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

3 files changed, 10 insertions, 11 deletions

diff --git a/include/llvm/CodeGen/RegClass.h b/include/llvm/CodeGen/RegClass.h
index 1e5f551..3db72b7 100644
--- a/include/llvm/CodeGen/RegClass.h
+++ b/include/llvm/CodeGen/RegClass.h
@@ -36,7 +36,7 @@ typedef std::vector<unsigned> ReservedColorListType;
 //
 //-----------------------------------------------------------------------------
 class RegClass {
-  const Method *const Meth;             // Method we are working on
+  const Function *const Meth;           // Function we are working on
   const MachineRegClassInfo *const MRC; // corresponding MRC
   const unsigned RegClassID;            // my int ID
 
@@ -47,7 +47,7 @@ class RegClass {
   const ReservedColorListType *const ReservedColorList;
   //
   // for passing registers that are pre-allocated and cannot be used by the
-  // register allocator for this method.
+  // register allocator for this function.
   
   bool *IsColorUsedArr;
   //
@@ -69,14 +69,13 @@ class RegClass {
 
  public:
 
-  RegClass(const Method *const M, 
-	   const MachineRegClassInfo *const MRC, 
-	   const ReservedColorListType *const RCL = NULL);
+  RegClass(const Function *M,
+	   const MachineRegClassInfo *MRC,
+	   const ReservedColorListType *RCL = 0);
 
-  ~RegClass() { delete[] IsColorUsedArr; };
+  ~RegClass() { delete[] IsColorUsedArr; }
 
-  inline void createInterferenceGraph() 
-    { IG.createGraph(); }
+  inline void createInterferenceGraph() { IG.createGraph(); }
 
   inline InterferenceGraph &getIG() { return IG; }
 
diff --git a/include/llvm/Support/InstVisitor.h b/include/llvm/Support/InstVisitor.h
index f56847a..c379cc1 100644
--- a/include/llvm/Support/InstVisitor.h
+++ b/include/llvm/Support/InstVisitor.h
@@ -68,7 +68,7 @@ struct InstVisitor {
   // Define visitors for modules, methods and basic blocks...
   //
   void visit(Module *M) { visit(M->begin(), M->end()); }
-  void visit(Method *M) { visit(M->begin(), M->end()); }
+  void visit(Function *F) { visit(F->begin(), F->end()); }
   void visit(BasicBlock *BB) { visit(BB->begin(), BB->end()); }
 
   // visit - Finally, code to visit an instruction...
diff --git a/include/llvm/iTerminators.h b/include/llvm/iTerminators.h
index 8feeac5..790b0e2 100644
--- a/include/llvm/iTerminators.h
+++ b/include/llvm/iTerminators.h
@@ -208,8 +208,8 @@ public:
   inline const Function *getCalledFunction() const {
     return dyn_cast<Function>(Operands[0].get());
   }
-  inline Method *getCalledFunction() {
-    return dyn_cast<Method>(Operands[0].get());
+  inline Function *getCalledFunction() {
+    return dyn_cast<Function>(Operands[0].get());
   }
 
   // getCalledValue - Get a pointer to a method that is invoked by this inst.