[llvm-commits] [llvm] r59758 - /llvm/trunk/lib/Transforms/IPO/Inliner.cpp

[Bill Wendling]

Author: void
Date: Thu Nov 20 18:09:21 2008
New Revision: 59758

URL: http://llvm.org/viewvc/llvm-project?rev=59758&view=rev
Log:
Fix error where it wasn't getting the correct caller function.

Modified:
    llvm/trunk/lib/Transforms/IPO/Inliner.cpp

Modified: llvm/trunk/lib/Transforms/IPO/Inliner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/Inliner.cpp?rev=59758&r1=59757&r2=59758&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/Inliner.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/Inliner.cpp Thu Nov 20 18:09:21 2008
@@ -54,11 +54,12 @@
                                  const std::set<Function*> &SCCFunctions,
                                  const TargetData &TD) {
   Function *Callee = CS.getCalledFunction();
+  Function *Caller = CS.getCaller();
+
   if (!InlineFunction(CS, &CG, &TD)) return false;
 
   // If the inlined function had a higher stack protection level than the
   // calling function, then bump up the caller's stack protection level.
-  Function *Caller = CS.getCaller();
   if (Callee->hasFnAttr(Attribute::StackProtectReq))
     Caller->addFnAttr(Attribute::StackProtectReq);
   else if (Callee->hasFnAttr(Attribute::StackProtect) &&