commit 7cdaa3a1a8dca7d1718f6e1ccb0abdf9a8e7e69d
author Bill Wendling <isanbard@gmail.com> Mon Sep 19 23:30:41 2011 +0000
committer Bill Wendling <isanbard@gmail.com> Mon Sep 19 23:30:41 2011 +0000
tree 624976fe1a3804de29580771185c0720b6131195
parent 4b0ae48614983089135cc5f374e5431de368dea7

Revert r140083 and r140084 until buildbots can be fixed.

llvm-svn: 140094

llvm/lib/Transforms/Utils/CodeExtractor.cpp

diff --git a/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
index 8b97685..126056b 100644
--- a/llvm/lib/Transforms/Utils/CodeExtractor.cpp
+++ b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
@@ -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);

llvm/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll

diff --git a/llvm/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll b/llvm/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll
index 0460c19..fc58577 100644
--- a/llvm/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll
+++ b/llvm/test/Transforms/CodeExtractor/2004-11-12-InvokeExtract.ll
@@ -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(...)