D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-08-18 20:30:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #525 from klickverbot/fix-gc2stack-ir

Browse Source 
Do not generate invalid IR in dgc2stack pass.
This commit is contained in:
Kai Nacke
2013-10-23 21:42:51 -07:00
parent 287e089927 36b70b68e8
commit cdecb99891
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gen/passes/GarbageCollect2Stack.cpp
View File

@@ -336,7 +336,6 @@ namespace {
AU.addRequired<DominatorTree>(); AU.addRequired<DominatorTree>();
AU.addPreserved<CallGraph>(); AU.addPreserved<CallGraph>();
AU.addPreserved<DominatorTree>();
} }
}; };
char GarbageCollect2Stack::ID = 0; char GarbageCollect2Stack::ID = 0;
@@ -363,20 +362,20 @@ GarbageCollect2Stack::GarbageCollect2Stack()
} }
static void RemoveCall(CallSite CS, const Analysis& A) { static void RemoveCall(CallSite CS, const Analysis& A) {
// For an invoke instruction, we insert a branch to the normal target BB
// immediately before it. Ideally, we would find a way to not invalidate
// the dominator tree here.
if (CS.isInvoke()) { if (CS.isInvoke()) {
InvokeInst* Invoke = cast<InvokeInst>(CS.getInstruction()); InvokeInst* Invoke = cast<InvokeInst>(CS.getInstruction());
// If this was an invoke instruction, we need to do some extra
// work to preserve the control flow.
// Create a "conditional" branch that -simplifycfg can clean up, so we BranchInst::Create(Invoke->getNormalDest(), Invoke);
// can keep using the DominatorTree without updating it. Invoke->getUnwindDest()->removePredecessor(CS->getParent());
BranchInst::Create(Invoke->getNormalDest(), Invoke->getUnwindDest(),
ConstantInt::getTrue(A.M.getContext()), Invoke->getParent());
} }
// Remove the runtime call. // Remove the runtime call.
if (A.CGNode) if (A.CGNode)
A.CGNode->removeCallEdgeFor(CS); A.CGNode->removeCallEdgeFor(CS);
CS.getInstruction()->eraseFromParent(); CS->eraseFromParent();
} }
static bool isSafeToStackAllocateArray(Instruction* Alloc, DominatorTree& DT, static bool isSafeToStackAllocateArray(Instruction* Alloc, DominatorTree& DT,