Change references to the Method class to be references to the Function

class.  The Method class is obsolete (renamed) and all references to it
are being converted over to Function.


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

1 files changed, 9 insertions, 9 deletions

diff --git a/lib/VMCore/iCall.cpp b/lib/VMCore/iCall.cpp
index d757ea2..4f1a1c9 100644
--- a/lib/VMCore/iCall.cpp
+++ b/lib/VMCore/iCall.cpp
@@ -7,22 +7,22 @@
 #include "llvm/iOther.h"
 #include "llvm/iTerminators.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/Method.h"
+#include "llvm/Function.h"
 
 //===----------------------------------------------------------------------===//
 //                        CallInst Implementation
 //===----------------------------------------------------------------------===//
 
-CallInst::CallInst(Value *Meth, const std::vector<Value*> &params, 
+CallInst::CallInst(Value *Func, const std::vector<Value*> &params, 
                    const std::string &Name) 
-  : Instruction(cast<FunctionType>(cast<PointerType>(Meth->getType())
+  : Instruction(cast<FunctionType>(cast<PointerType>(Func->getType())
 				 ->getElementType())->getReturnType(),
 		Instruction::Call, Name) {
   Operands.reserve(1+params.size());
-  Operands.push_back(Use(Meth, this));
+  Operands.push_back(Use(Func, this));
 
   const FunctionType *MTy = 
-    cast<FunctionType>(cast<PointerType>(Meth->getType())->getElementType());
+    cast<FunctionType>(cast<PointerType>(Func->getType())->getElementType());
 
   const FunctionType::ParamTypes &PL = MTy->getParamTypes();
   assert((params.size() == PL.size()) || 
@@ -43,19 +43,19 @@ CallInst::CallInst(const CallInst &CI)
 //                        InvokeInst Implementation
 //===----------------------------------------------------------------------===//
 
-InvokeInst::InvokeInst(Value *Meth, BasicBlock *IfNormal, \
+InvokeInst::InvokeInst(Value *Func, BasicBlock *IfNormal, \
 		       BasicBlock *IfException,
                        const std::vector<Value*> &params,
 		       const std::string &Name)
-  : TerminatorInst(cast<FunctionType>(cast<PointerType>(Meth->getType())
+  : TerminatorInst(cast<FunctionType>(cast<PointerType>(Func->getType())
 				    ->getElementType())->getReturnType(),
 		   Instruction::Invoke, Name) {
   Operands.reserve(3+params.size());
-  Operands.push_back(Use(Meth, this));
+  Operands.push_back(Use(Func, this));
   Operands.push_back(Use(IfNormal, this));
   Operands.push_back(Use(IfException, this));
   const FunctionType *MTy = 
-    cast<FunctionType>(cast<PointerType>(Meth->getType())->getElementType());
+    cast<FunctionType>(cast<PointerType>(Func->getType())->getElementType());
   
   const FunctionType::ParamTypes &PL = MTy->getParamTypes();
   assert((params.size() == PL.size()) ||