[llvm-commits] [llvm] r140094 - in /llvm/trunk: lib/Transforms/Utils/CodeExtractor.cpp test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll

[Bill Wendling]

Author: void
Date: Mon Sep 19 18:30:41 2011
New Revision: 140094

URL: http://llvm.org/viewvc/llvm-project?rev=140094&view=rev
Log:
Revert r140083 and r140084 until buildbots can be fixed.

Modified:
    llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp
    llvm/trunk/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll

Modified: llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp?rev=140094&r1=140093&r2=140094&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp Mon Sep 19 18:30:41 2011
@@ -664,13 +664,7 @@
   //  * Pass in uses as args
   // 3) Move code region, add call instr to func
   //
-  for (std::vector<BasicBlock*>::const_iterator
-         I = code.begin(), E = code.end(); I != E; ++I) {
-    BasicBlock *BB = *I;
-    BlocksToExtract.insert(BB);
-    if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator()))
-      BlocksToExtract.insert(II->getUnwindDest());
-  }
+  BlocksToExtract.insert(code.begin(), code.end());
 
   Values inputs, outputs;
 
@@ -794,7 +788,6 @@
 /// ExtractBasicBlock - slurp a basic block into a brand new function
 ///
 Function* llvm::ExtractBasicBlock(BasicBlock *BB, bool AggregateArgs) {
-  if (BB->isLandingPad()) return 0;
   std::vector<BasicBlock*> Blocks;
   Blocks.push_back(BB);
   return CodeExtractor(0, AggregateArgs).ExtractCodeRegion(Blocks);

Modified: llvm/trunk/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll?rev=140094&r1=140093&r2=140094&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll (original)
+++ llvm/trunk/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll Mon Sep 19 18:30:41 2011
@@ -10,9 +10,6 @@
         ret i32 %V
 
 Unw:            ; preds = %EB
-        %exn = landingpad {i8*, i32} personality i32 (...)* @__gcc_personality_v0
-                 catch i8* null
-        resume { i8*, i32 } %exn
+        unwind
 }
 
-declare i32 @__gcc_personality_v0(...)