s/Method/Function

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

diff --git a/lib/Analysis/IPA/CallGraph.cpp b/lib/Analysis/IPA/CallGraph.cpp
index 98dfbf7e26f1e9df1455edbe74e10a974013d45a..63bb968e9254ecac79299c84ba4f24f7268419f6 100644 (file)
--- a/lib/Analysis/IPA/CallGraph.cpp
+++ b/lib/Analysis/IPA/CallGraph.cpp
@@ -100,10 +100,10 @@ void CallGraph::addToCallGraph(Function *M) {
       Instruction *I = *II;
 
       if (CallInst *CI = dyn_cast<CallInst>(I)) {
-        if (CI->getCalledMethod() == 0)
+        if (CI->getCalledFunction() == 0)
           Node->addCalledMethod(ExternalNode);
       } else if (InvokeInst *II = dyn_cast<InvokeInst>(I)) {
-        if (II->getCalledMethod() == 0)
+        if (II->getCalledFunction() == 0)
           Node->addCalledMethod(ExternalNode);
       }
     }

diff --git a/lib/Transforms/IPO/InlineSimple.cpp b/lib/Transforms/IPO/InlineSimple.cpp
index 9ca23f744845406ca5f435afd554137a1f6ced3e..51cde2e799f5880af41e7992b50ad8b3fe5c87b0 100644 (file)
--- a/lib/Transforms/IPO/InlineSimple.cpp
+++ b/lib/Transforms/IPO/InlineSimple.cpp
@@ -69,7 +69,7 @@ bool InlineMethod(BasicBlock::iterator CIIt) {
   assert((*CIIt)->getParent()->getParent() && "Instruction not in method!");
 
   CallInst *CI = cast<CallInst>(*CIIt);
-  const Method *CalledMeth = CI->getCalledMethod();
+  const Function *CalledMeth = CI->getCalledFunction();
   if (CalledMeth == 0 ||   // Can't inline external method or indirect call!
       CalledMeth->isExternal()) return false;
 
@@ -242,8 +242,8 @@ static inline bool DoMethodInlining(BasicBlock *BB) {
   for (BasicBlock::iterator I = BB->begin(); I != BB->end(); ++I) {
     if (CallInst *CI = dyn_cast<CallInst>(*I)) {
       // Check to see if we should inline this method
-      Method *M = CI->getCalledMethod();
-      if (M && ShouldInlineMethod(CI, M))
+      Method *F = CI->getCalledFunction();
+      if (F && ShouldInlineMethod(CI, F))
        return InlineMethod(I);
     }
   }