diff options
| author | Volodymyr Sapsai <vsapsai@apple.com> | 2017-11-17 18:28:05 +0000 |
|---|---|---|
| committer | Volodymyr Sapsai <vsapsai@apple.com> | 2017-11-17 18:28:05 +0000 |
| commit | 8b46ff1648ce2727263e151496ea300d25abdb88 (patch) | |
| tree | c15be921020be43fc3c491cbdf9b22d69c01a6ca | |
| parent | c94d393ad52b6698b15400ee7a33a68b4bda274b (diff) | |
| download | bcm5719-llvm-8b46ff1648ce2727263e151496ea300d25abdb88.tar.gz bcm5719-llvm-8b46ff1648ce2727263e151496ea300d25abdb88.zip | |
[ThinLTO] Remove too aggressive assertion in building function call graph.
The assertion was introduced in r317853 but there are cases when a call
isn't handled either as direct or indirect. In this case we add a
reference graph edge but not a call graph edge.
Reviewers: tejohnson
Reviewed By: tejohnson
Subscribers: mehdi_amini, inglorion, eraman, hiraditya, efriedma, llvm-commits
Differential Revision: https://reviews.llvm.org/D40056
llvm-svn: 318540
| -rw-r--r-- | llvm/lib/Analysis/ModuleSummaryAnalysis.cpp | 5 | ||||
| -rw-r--r-- | llvm/test/Bitcode/thinlto-function-summary-callgraph-cast.ll | 16 |
2 files changed, 17 insertions, 4 deletions
diff --git a/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp b/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp index 8d1e7ee770f..d54fb700200 100644 --- a/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp +++ b/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp @@ -280,8 +280,9 @@ computeFunctionSummary(ModuleSummaryIndex &Index, const Module &M, // Skip inline assembly calls. if (CI && CI->isInlineAsm()) continue; - assert(CalledValue && !isa<Constant>(CalledValue) && - "Expected indirect call"); + // Skip direct calls. + if (!CalledValue || isa<Constant>(CalledValue)) + continue; uint32_t NumVals, NumCandidates; uint64_t TotalCount; diff --git a/llvm/test/Bitcode/thinlto-function-summary-callgraph-cast.ll b/llvm/test/Bitcode/thinlto-function-summary-callgraph-cast.ll index b377ba8f00d..45801c9a74d 100644 --- a/llvm/test/Bitcode/thinlto-function-summary-callgraph-cast.ll +++ b/llvm/test/Bitcode/thinlto-function-summary-callgraph-cast.ll @@ -5,8 +5,10 @@ ; CHECK: <GLOBALVAL_SUMMARY_BLOCK ; CHECK-NEXT: <VERSION -; "op7=1" is a call to "callee" function. -; CHECK-NEXT: <PERMODULE {{.*}} op7=1 op8=[[ALIASID:[0-9]+]]/> +; "op7" is a call to "callee" function. +; CHECK-NEXT: <PERMODULE {{.*}} op7=3 op8=[[ALIASID:[0-9]+]]/> +; "another_caller" has only references but no calls. +; CHECK-NEXT: <PERMODULE {{.*}} op4=3 {{.*}} op7={{[0-9]+}}/> ; CHECK-NEXT: <PERMODULE {{.*}} op0=[[ALIASEEID:[0-9]+]] ; CHECK-NEXT: <ALIAS {{.*}} op0=[[ALIASID]] {{.*}} op2=[[ALIASEEID]]/> ; CHECK-NEXT: </GLOBALVAL_SUMMARY_BLOCK> @@ -21,6 +23,12 @@ define void @caller() { ret void } +define void @another_caller() { + ; Test calls that aren't handled either as direct or indirect. + call void select (i1 icmp eq (i32* @global, i32* null), void ()* @f, void ()* @g)() + ret void +} + declare void @callee(...) @analias = alias void (...), bitcast (void ()* @aliasee to void (...)*) @@ -29,3 +37,7 @@ define void @aliasee() { entry: ret void } + +declare void @f() +declare void @g() +@global = extern_weak global i32 |
