Rename Method to Function
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1957 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/InstrSched/SchedGraph.h b/lib/CodeGen/InstrSched/SchedGraph.h
index fb6087c..99e2057 100644
--- a/lib/CodeGen/InstrSched/SchedGraph.h
+++ b/lib/CodeGen/InstrSched/SchedGraph.h
@@ -28,7 +28,7 @@
class Instruction;
class TerminatorInst;
class BasicBlock;
-class Method;
+class Function;
class TargetMachine;
class SchedGraphEdge;
class SchedGraphNode;
@@ -339,7 +339,7 @@
private std::hash_map<const BasicBlock*, SchedGraph*>
{
private:
- const Method* method;
+ const Function* method;
public:
typedef std::hash_map<const BasicBlock*, SchedGraph*> map_base;
@@ -347,7 +347,7 @@
using map_base::const_iterator;
public:
- /*ctor*/ SchedGraphSet (const Method* _method,
+ /*ctor*/ SchedGraphSet (const Function * function,
const TargetMachine& target);
/*dtor*/ ~SchedGraphSet ();
@@ -379,7 +379,7 @@
//
// Graph builder
//
- void buildGraphsForMethod (const Method *method,
+ void buildGraphsForMethod (const Function *F,
const TargetMachine& target);
};
diff --git a/lib/CodeGen/InstrSched/SchedPriorities.h b/lib/CodeGen/InstrSched/SchedPriorities.h
index f99d7ce..2d0bff9 100644
--- a/lib/CodeGen/InstrSched/SchedPriorities.h
+++ b/lib/CodeGen/InstrSched/SchedPriorities.h
@@ -28,7 +28,7 @@
#include <list>
#include <ext/hash_set>
#include <iostream>
-class Method;
+class Function;
class MachineInstr;
class SchedulingManager;
class MethodLiveVarInfo;
@@ -125,7 +125,8 @@
class SchedPriorities: public NonCopyable {
public:
- SchedPriorities(const Method *M, const SchedGraph *G, MethodLiveVarInfo &LVI);
+ SchedPriorities(const Function *F, const SchedGraph *G,
+ MethodLiveVarInfo &LVI);
// This must be called before scheduling begins.
diff --git a/lib/CodeGen/RegAlloc/LiveRangeInfo.h b/lib/CodeGen/RegAlloc/LiveRangeInfo.h
index 48e81c1..4af73f0 100644
--- a/lib/CodeGen/RegAlloc/LiveRangeInfo.h
+++ b/lib/CodeGen/RegAlloc/LiveRangeInfo.h
@@ -1,4 +1,4 @@
-//===-- LiveRangeInfo.h - Track all LiveRanges for a Method ------*- C++ -*-==//
+//===-- LiveRangeInfo.h - Track all LiveRanges for a Function ----*- C++ -*-==//
//
// This file contains the class LiveRangeInfo which constructs and keeps
// the LiveRangMap which contains all the live ranges used in a method.
@@ -28,7 +28,7 @@
class MachineRegInfo;
class TargetMachine;
class Value;
-class Method;
+class Function;
class Instruction;
typedef std::hash_map<const Value*, LiveRange*> LiveRangeMapType;
@@ -42,7 +42,7 @@
//----------------------------------------------------------------------------
class LiveRangeInfo {
- const Method *const Meth; // Method for which live range info is held
+ const Function *const Meth; // Func for which live range info is held
LiveRangeMapType LiveRangeMap; // A map from Value * to LiveRange * to
// record all live ranges in a method
// created by constructLiveRanges
@@ -64,11 +64,11 @@
void suggestRegs4CallRets();
- const Method* getMethod() { return Meth; }
+ const Function *getMethod() { return Meth; }
public:
- LiveRangeInfo(const Method *M,
+ LiveRangeInfo(const Function *F,
const TargetMachine& tm,
std::vector<RegClass *> & RCList);