mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-26 07:24:25 +00:00
When PruneEH turned an invoke into an ordinary
call (thus changing the call site) it didn't inform the callgraph about this. But the call site does matter - as shown by the testcase, the callgraph become invalid after the inliner ran (with an edge between two functions simply missing), resulting in wrong deductions by GlobalsModRef. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@55872 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -156,6 +156,9 @@ bool PruneEH::runOnSCC(const std::vector<CallGraphNode *> &SCC) {
|
||||
// function if we have invokes to non-unwinding functions or code after calls to
|
||||
// no-return functions.
|
||||
bool PruneEH::SimplifyFunction(Function *F) {
|
||||
CallGraph &CG = getAnalysis<CallGraph>();
|
||||
CallGraphNode *CGN = CG[F];
|
||||
|
||||
bool MadeChange = false;
|
||||
for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
|
||||
if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator()))
|
||||
@ -174,6 +177,9 @@ bool PruneEH::SimplifyFunction(Function *F) {
|
||||
BasicBlock *UnwindBlock = II->getUnwindDest();
|
||||
UnwindBlock->removePredecessor(II->getParent());
|
||||
|
||||
// Fix up the call graph.
|
||||
CGN->replaceCallSite(II, Call);
|
||||
|
||||
// Insert a branch to the normal destination right before the
|
||||
// invoke.
|
||||
BranchInst::Create(II->getNormalDest(), II);
|
||||
|
Reference in New Issue
Block a user