[llvm-branch-commits] [llvm-branch] r82241 - /llvm/branches/Apple/Bender-SWB/lib/Transforms/Utils/InlineFunction.cpp

[Bill Wendling]

Author: void
Date: Fri Sep 18 13:28:48 2009
New Revision: 82241

URL: http://llvm.org/viewvc/llvm-project?rev=82241&view=rev
Log:
Apply Eric's candidate patch for <rdar://problem/7151726>.

Modified:
    llvm/branches/Apple/Bender-SWB/lib/Transforms/Utils/InlineFunction.cpp

Modified: llvm/branches/Apple/Bender-SWB/lib/Transforms/Utils/InlineFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender-SWB/lib/Transforms/Utils/InlineFunction.cpp?rev=82241&r1=82240&r2=82241&view=diff

==============================================================================
--- llvm/branches/Apple/Bender-SWB/lib/Transforms/Utils/InlineFunction.cpp (original)
+++ llvm/branches/Apple/Bender-SWB/lib/Transforms/Utils/InlineFunction.cpp Fri Sep 18 13:28:48 2009
@@ -270,6 +270,12 @@
       return false;
   }
 
+  // FIXME: When we get inlining across invokes and eh information
+  // better coordinated, turn this back on.
+  if (isa<InvokeInst>(TheCall) && !MarkNoUnwind
+      && !CalledFunc->hasFnAttr(Attribute::AlwaysInline))
+    return false;
+
   // Get an iterator to the last basic block in the function, which will have
   // the new function inlined after it.
   //