[PATCH] D40056: [ThinLTO] Remove too aggressive assertion in building function call graph.

[Volodymyr Sapsai via Phabricator via llvm-commits]

vsapsai created this revision.
Herald added subscribers: hiraditya, eraman, inglorion, mehdi_amini.

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.


https://reviews.llvm.org/D40056

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


Index: llvm/test/Bitcode/thinlto-function-summary-callgraph-cast.ll
===================================================================
--- llvm/test/Bitcode/thinlto-function-summary-callgraph-cast.ll
+++ 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,11 +23,21 @@
     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 (...)*)
 
 define void @aliasee() {
 entry:
     ret void
 }
+
+declare void @f()
+declare void @g()
+ at global = extern_weak global i32
Index: llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
===================================================================
--- llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
+++ llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
@@ -280,8 +280,9 @@
         // 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;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D40056.122944.patch
Type: text/x-patch
Size: 1969 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171115/8c7dcb4b/attachment-0001.bin>