diff options
| -rw-r--r-- | lib/Transforms/IPO/LowerSetJmp.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/Transforms/IPO/LowerSetJmp.cpp b/lib/Transforms/IPO/LowerSetJmp.cpp index 266729d6ca..3a86cb763b 100644 --- a/lib/Transforms/IPO/LowerSetJmp.cpp +++ b/lib/Transforms/IPO/LowerSetJmp.cpp @@ -272,9 +272,17 @@ void LowerSetJmp::TransformLongJmpCall(CallInst* Inst) else new UnwindInst(Inst); - // Remove all insts after the branch/unwind inst. - Inst->getParent()->getInstList().erase(Inst, - Inst->getParent()->getInstList().end()); + // Remove all insts after the branch/unwind inst. Go from back to front to + // avoid replaceAllUsesWith if possible. + BasicBlock *BB = Inst->getParent(); + Instruction *Removed; + do { + Removed = &BB->back(); + // If the removed instructions have any users, replace them now. + if (!Removed->use_empty()) + Removed->replaceAllUsesWith(UndefValue::get(Removed->getType())); + Removed->eraseFromParent(); + } while (Removed != Inst); ++LongJmpsTransformed; } |