Update the block cloner which fixes bugpoint on code using unwind_to (phew!)
and also update the cloning interface's major user, the loop optimizations.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48088 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/Scalar/LoopUnswitch.cpp b/lib/Transforms/Scalar/LoopUnswitch.cpp
index 8d39a4d..966038d 100644
--- a/lib/Transforms/Scalar/LoopUnswitch.cpp
+++ b/lib/Transforms/Scalar/LoopUnswitch.cpp
@@ -819,10 +819,14 @@
}
// Rewrite the code to refer to itself.
- for (unsigned i = 0, e = NewBlocks.size(); i != e; ++i)
- for (BasicBlock::iterator I = NewBlocks[i]->begin(),
- E = NewBlocks[i]->end(); I != E; ++I)
+ for (unsigned i = 0, e = NewBlocks.size(); i != e; ++i) {
+ BasicBlock *NB = NewBlocks[i];
+ if (BasicBlock *UnwindDest = NB->getUnwindDest())
+ NB->setUnwindDest(cast<BasicBlock>(ValueMap[UnwindDest]));
+
+ for (BasicBlock::iterator I = NB->begin(), E = NB->end(); I != E; ++I)
RemapInstruction(I, ValueMap);
+ }
// Rewrite the original preheader to select between versions of the loop.
BranchInst *OldBR = cast<BranchInst>(OrigPreheader->getTerminator());