maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

fix a crash building SPASS by tolerating a callsite that doesn't exist 

in the callgraph, see the big comment at the top of the testcase.

llvm-svn: 80541
This commit is contained in:
Chris Lattner 2009-08-31 05:46:59 +00:00
parent 9e50747958
commit b822abd37d
2 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
llvm/lib/Analysis/IPA/CallGraph.cpp
View File

@ -239,16 +239,21 @@ void CallGraphNode::dump() const { print(errs()); }
/// specified call site. Note that this method takes linear time, so it /// specified call site. Note that this method takes linear time, so it
/// should be used sparingly. /// should be used sparingly.
void CallGraphNode::removeCallEdgeFor(CallSite CS) { void CallGraphNode::removeCallEdgeFor(CallSite CS) {
for (CalledFunctionsVector::iterator I = CalledFunctions.begin(); ; ++I) { // Scan for the call site. Note that we aren't guaranteed to find the call
assert(I != CalledFunctions.end() && "Cannot find callsite to remove!"); // site in this node, even in reasonable situations. Passes like instcombine
if (I->first == CS) { // can adjust callsites (e.g. folding bitcasts into calls to make them direct)
// which can introduce new call sites. Since instcombine is not callgraph
// aware, it doesn't know to tell CallGraph about this change.
for (CalledFunctionsVector::iterator I = CalledFunctions.begin();
I != CalledFunctions.end(); ++I) {
if (I->first != CS) continue;
I->second->DropRef(); I->second->DropRef();
*I = CalledFunctions.back(); *I = CalledFunctions.back();
CalledFunctions.pop_back(); CalledFunctions.pop_back();
return; return;
} }
} }
}
// removeAnyCallEdgeTo - This method removes any call edges from this node to // removeAnyCallEdgeTo - This method removes any call edges from this node to

57
llvm/test/Transforms/Inline/crash.ll Normal file
View File

@ -0,0 +1,57 @@
; RUN: llvm-as < %s | opt -inline -argpromotion -instcombine -disable-output
; This test was failing because the inliner would inline @list_DeleteElement
; into @list_DeleteDuplicates and then into @inf_GetBackwardPartnerLits,
; turning the indirect call into a direct one. This allowed instcombine to see
; the bitcast and eliminate it, deleting the original call and introducing
; another one. This crashed the inliner because the new call was not in the
; callgraph.
target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
target triple = "i386-apple-darwin10.0"
define void @list_DeleteElement(i32 (i8*, i8*)* nocapture %Test) nounwind ssp {
entry:
%0 = call i32 %Test(i8* null, i8* undef) nounwind
ret void
}
define void @list_DeleteDuplicates(i32 (i8*, i8*)* nocapture %Test) nounwind ssp {
foo:
call void @list_DeleteElement(i32 (i8*, i8*)* %Test) nounwind ssp
call fastcc void @list_Rplacd1284() nounwind ssp
unreachable
}
define internal i32 @inf_LiteralsHaveSameSubtermAndAreFromSameClause(i32* nocapture %L1, i32* nocapture %L2) nounwind readonly ssp {
entry:
unreachable
}
define internal fastcc void @inf_GetBackwardPartnerLits(i32* nocapture %Flags) nounwind ssp {
test:
call void @list_DeleteDuplicates(i32 (i8*, i8*)* bitcast (i32 (i32*, i32*)* @inf_LiteralsHaveSameSubtermAndAreFromSameClause to i32 (i8*, i8*)*)) nounwind
ret void
}
define void @inf_BackwardEmptySortPlusPlus() nounwind ssp {
entry:
call fastcc void @inf_GetBackwardPartnerLits(i32* null) nounwind ssp
unreachable
}
define void @inf_BackwardWeakening() nounwind ssp {
entry:
call fastcc void @inf_GetBackwardPartnerLits(i32* null) nounwind ssp
unreachable
}
declare fastcc void @list_Rplacd1284() nounwind ssp