[llvm-branch-commits] [llvm-branch] r81889 - in /llvm/branches/Apple/Bender-SWB: lib/Transforms/Utils/InlineFunction.cpp test/FrontendC++/2007-05-23-TryFinally.cpp

[Bill Wendling]

Author: void
Date: Tue Sep 15 13:32:15 2009
New Revision: 81889

URL: http://llvm.org/viewvc/llvm-project?rev=81889&view=rev
Log:
--- Reverse-merging r81439 into '.':
U    test/FrontendC++/2007-05-23-TryFinally.cpp
U    lib/Transforms/Utils/InlineFunction.cpp

Revert test of Eric's patch.

Modified:
    llvm/branches/Apple/Bender-SWB/lib/Transforms/Utils/InlineFunction.cpp
    llvm/branches/Apple/Bender-SWB/test/FrontendC++/2007-05-23-TryFinally.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=81889&r1=81888&r2=81889&view=diff

==============================================================================
--- llvm/branches/Apple/Bender-SWB/lib/Transforms/Utils/InlineFunction.cpp (original)
+++ llvm/branches/Apple/Bender-SWB/lib/Transforms/Utils/InlineFunction.cpp Tue Sep 15 13:32:15 2009
@@ -270,11 +270,6 @@
       return false;
   }
 
-  // FIXME: When we rework invoke/unwind/selector handling for unwinding
-  // ordering we can turn this back on.
-  if (isa<InvokeInst>(TheCall) && !MarkNoUnwind)
-    return false;
-
   // Get an iterator to the last basic block in the function, which will have
   // the new function inlined after it.
   //

Modified: llvm/branches/Apple/Bender-SWB/test/FrontendC++/2007-05-23-TryFinally.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender-SWB/test/FrontendC%2B%2B/2007-05-23-TryFinally.cpp?rev=81889&r1=81888&r2=81889&view=diff

==============================================================================
--- llvm/branches/Apple/Bender-SWB/test/FrontendC++/2007-05-23-TryFinally.cpp (original)
+++ llvm/branches/Apple/Bender-SWB/test/FrontendC++/2007-05-23-TryFinally.cpp Tue Sep 15 13:32:15 2009
@@ -1,4 +1,4 @@
-// RUN: %llvmgxx %s -S -emit-llvm -O2 -o - | ignore grep " unwind\$" | \
+// RUN: %llvmgxx %s -S -emit-llvm -O2 -o - | ignore grep _Unwind_Resume | \
 // RUN:   wc -l | grep {\[23\]}
 
 struct One { };