[llvm] r318540 - [ThinLTO] Remove too aggressive assertion in building function call graph.

[Volodymyr Sapsai via llvm-commits]

Author: vsapsai
Date: Fri Nov 17 10:28:05 2017
New Revision: 318540

URL: http://llvm.org/viewvc/llvm-project?rev=318540&view=rev
Log:
[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


Modified:
    llvm/trunk/lib/Analysis/ModuleSummaryAnalysis.cpp
    llvm/trunk/test/Bitcode/thinlto-function-summary-callgraph-cast.ll

Modified: llvm/trunk/lib/Analysis/ModuleSummaryAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ModuleSummaryAnalysis.cpp?rev=318540&r1=318539&r2=318540&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/ModuleSummaryAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/ModuleSummaryAnalysis.cpp Fri Nov 17 10:28:05 2017
@@ -280,8 +280,9 @@ computeFunctionSummary(ModuleSummaryInde
         // 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;

Modified: llvm/trunk/test/Bitcode/thinlto-function-summary-callgraph-cast.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/thinlto-function-summary-callgraph-cast.ll?rev=318540&r1=318539&r2=318540&view=diff
==============================================================================
--- llvm/trunk/test/Bitcode/thinlto-function-summary-callgraph-cast.ll (original)
+++ llvm/trunk/test/Bitcode/thinlto-function-summary-callgraph-cast.ll Fri Nov 17 10:28:05 2017
@@ -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()
+ at global = extern_weak global i32