D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-15 20:33:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't forget to update the control flow when deleting an invoke.

Browse Source 
Fixes #284.
This commit is contained in:
Frits van Bommel
2009-05-04 12:08:30 +02:00
parent fa79329102
commit f7e54dce10
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gen/passes/GarbageCollect2Stack.cpp
View File

@@ -96,6 +96,21 @@ bool GarbageCollect2Stack::doInitialization(Module &M) {
KnownFunctions["_d_newarrayvT"] = new FunctionInfo(0, 1, true);
}
static void RemoveCall(Instruction* Inst) {
if (InvokeInst* Invoke = dyn_cast<InvokeInst>(Inst)) {
// If this was an invoke instruction, we need to do some extra
// work to preserve the control flow.
// First notify the exception landing pad block that we won't be
// going there anymore.
Invoke->getUnwindDest()->removePredecessor(Invoke->getParent());
// Create a branch to the "normal" destination.
BranchInst::Create(Invoke->getNormalDest(), Invoke->getParent());
}
// Remove the runtime call.
Inst->eraseFromParent();
}
/// runOnFunction - Top level algorithm.
///
bool GarbageCollect2Stack::runOnFunction(Function &F) {
@@ -146,7 +161,7 @@ bool GarbageCollect2Stack::runOnFunction(Function &F) {
if (Inst->use_empty() && info->SafeToDelete) {
Changed = true;
NumDeleted++;
Inst->eraseFromParent();
RemoveCall(Inst);
continue;
}
@@ -218,17 +233,7 @@ bool GarbageCollect2Stack::runOnFunction(Function &F) {
newVal = Builder.CreateBitCast(newVal, Inst->getType());
Inst->replaceAllUsesWith(newVal);
// If this was an invoke instruction, update the control flow.
if (InvokeInst* Invoke = dyn_cast<InvokeInst>(Inst)) {
// Notify the exception landing pad block that we won't be
// going there anymore.
Invoke->getUnwindDest()->removePredecessor(Invoke->getParent());
// Create a branch to the "normal" destination.
BranchInst::Create(Invoke->getNormalDest(), Invoke->getParent());
}
// Finally, remove the runtime call.
Inst->eraseFromParent();
RemoveCall(Inst);
}
}