RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-26 13:10:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add a DEBUG call so that -debug lists when CGSCCPM iterates.

Browse Source 
Fix RefreshCallGraph to use CGN->replaceCallEdge instead of hand
rolling its own loop.  replaceCallEdge properly maintains the
reference counts of the nodes, fixing a crash exposed by the
iterative callgraph stuff.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@102120 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2010-04-22 20:42:33 +00:00
parent f8b99cb03b
commit b61789d4dd
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Analysis/IPA/CallGraphSCCPass.cpp
View File

@ -278,13 +278,7 @@ bool CGPassManager::RefreshCallGraph(CallGraphSCC &CurSCC,
}
// Update the edge target in CGN.
for (CallGraphNode::iterator I = CGN->begin(); ; ++I) {
assert(I != CGN->end() && "Didn't find call entry");
if (I->first == CS.getInstruction()) {
I->second = CalleeNode;
break;
}
}
CGN->replaceCallEdge(CS, CS, CalleeNode);
MadeChange = true;
continue;
}
@ -422,6 +416,9 @@ bool CGPassManager::runOnModule(Module &M) {
unsigned Iteration = 0;
bool DevirtualizedCall = false;
do {
DEBUG(if (Iteration)
dbgs() << " SCCPASSMGR: Re-visiting SCC, iteration #"
<< Iteration << '\n');
DevirtualizedCall = false;
Changed |= RunAllPassesOnSCC(CurSCC, CG, DevirtualizedCall);
} while (Iteration++ < MaxIterations && DevirtualizedCall);

29
test/Transforms/Inline/crash2.ll Normal file
View File

@ -0,0 +1,29 @@
; RUN: opt -inline -scalarrepl -max-cg-scc-iterations=1 %s -disable-output
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
target triple = "x86_64-apple-darwin10.3"
declare i8* @f1(i8*) ssp align 2
define linkonce_odr void @f2(i8* %t) inlinehint ssp {
entry:
unreachable
}
define linkonce_odr void @f3(void (i8*)* %__f) ssp {
entry:
%__f_addr = alloca void (i8*)*, align 8
store void (i8*)* %__f, void (i8*)** %__f_addr
%0 = load void (i8*)** %__f_addr, align 8
call void %0(i8* undef)
call i8* @f1(i8* undef) ssp
unreachable
}
define linkonce_odr void @f4(i8* %this) ssp align 2 {
entry:
%0 = alloca i32
call void @f3(void (i8*)* @f2) ssp
ret void
}