From 3987abdfe3d31b411b4e7eb7dd3724888a27b4ab Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 5 May 2005 15:47:43 +0000 Subject: [PATCH] Fix a bug compimling Ruby, fixing this testcase: LowerSetJmp/2005-05-05-OldUses.ll git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21696 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/LowerSetJmp.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/Transforms/IPO/LowerSetJmp.cpp b/lib/Transforms/IPO/LowerSetJmp.cpp index 266729d6ca5..3a86cb763ba 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; } -- 2.34.1