From: Bill Wendling Date: Mon, 19 Sep 2011 23:00:52 +0000 (+0000) Subject: If we are extracting a basic block that ends in an invoke call, we must also X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ad027053fe39242529a619d70c87dd535b788bbe;p=oota-llvm.git If we are extracting a basic block that ends in an invoke call, we must also extract the landing pad block. Otherwise, there will be a situation where the invoke's unwind edge lands on a non-landing pad. We also forbid the user from extracting the landing pad block by itself. Again, this is not a valid transformation. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@140083 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/Utils/CodeExtractor.cpp b/lib/Transforms/Utils/CodeExtractor.cpp index 126056b844c..8b9768520e0 100644 --- a/lib/Transforms/Utils/CodeExtractor.cpp +++ b/lib/Transforms/Utils/CodeExtractor.cpp @@ -664,7 +664,13 @@ ExtractCodeRegion(const std::vector &code) { // * Pass in uses as args // 3) Move code region, add call instr to func // - BlocksToExtract.insert(code.begin(), code.end()); + for (std::vector::const_iterator + I = code.begin(), E = code.end(); I != E; ++I) { + BasicBlock *BB = *I; + BlocksToExtract.insert(BB); + if (InvokeInst *II = dyn_cast(BB->getTerminator())) + BlocksToExtract.insert(II->getUnwindDest()); + } Values inputs, outputs; @@ -788,6 +794,7 @@ 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 Blocks; Blocks.push_back(BB); return CodeExtractor(0, AggregateArgs).ExtractCodeRegion(Blocks);