Revert r140083 and r140084 until buildbots can be fixed.

llvm-svn: 140094

1 files changed, 1 insertions, 8 deletions

diff --git a/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
index 8b9768520e0..126056b844c 100644
--- a/llvm/lib/Transforms/Utils/CodeExtractor.cpp
+++ b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
@@ -664,13 +664,7 @@ ExtractCodeRegion(const std::vector<BasicBlock*> &code) {
   //  * 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 @@ Function* llvm::ExtractLoop(DominatorTree &DT, Loop *L, bool AggregateArgs) {
 /// 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);