[PATCH] D39356: [ThinLTO] Fix missing call graph edges for calls with bitcasts.

Volodymyr Sapsai via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Mon Nov 6 12:57:22 PST 2017


vsapsai updated this revision to Diff 121771.
vsapsai added a comment.

- Address review comment: be more conservative in stripPointerCastsNoFollowAliases().
- Assert that we don't have direct calls in branch for indirect calls instead of simply skipping direct calls.

Added assertion didn't cause any test failures in `ninja check-all` when
running locally.


https://reviews.llvm.org/D39356

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
===================================================================
--- /dev/null
+++ llvm/test/Bitcode/thinlto-function-summary-callgraph-cast.ll
@@ -0,0 +1,31 @@
+; Test to check the callgraph for calls to casts.
+; RUN: opt -module-summary %s -o %t.o
+; RUN: llvm-bcanalyzer -dump %t.o | FileCheck %s
+; PR34966
+
+; CHECK:       <GLOBALVAL_SUMMARY_BLOCK
+; CHECK-NEXT:    <VERSION
+; "op7=1" is a call to "callee" function.
+; CHECK-NEXT:    <PERMODULE {{.*}} op7=1 op8=[[ALIASID:[0-9]+]]/>
+; CHECK-NEXT:    <PERMODULE {{.*}} op0=[[ALIASEEID:[0-9]+]]
+; CHECK-NEXT:    <ALIAS {{.*}} op0=[[ALIASID]] {{.*}} op2=[[ALIASEEID]]/>
+; CHECK-NEXT:  </GLOBALVAL_SUMMARY_BLOCK>
+
+; ModuleID = 'thinlto-function-summary-callgraph-cast.ll'
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+define void @caller() {
+    call void bitcast (void (...)* @callee to void ()*)()
+    call void bitcast (void (...)* @analias to void ()*)()
+    ret void
+}
+
+declare void @callee(...)
+
+ at analias = alias void (...), bitcast (void ()* @aliasee to void (...)*)
+
+define void @aliasee() {
+entry:
+    ret void
+}
Index: llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
===================================================================
--- llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
+++ llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
@@ -243,6 +243,11 @@
 
       auto *CalledValue = CS.getCalledValue();
       auto *CalledFunction = CS.getCalledFunction();
+      if (CalledValue && !CalledFunction) {
+        CalledValue = CalledValue->stripPointerCastsNoFollowAliases();
+        // Stripping pointer casts can reveal a called function.
+        CalledFunction = dyn_cast<Function>(CalledValue);
+      }
       // Check if this is an alias to a function. If so, get the
       // called aliasee for the checks below.
       if (auto *GA = dyn_cast<GlobalAlias>(CalledValue)) {
@@ -275,9 +280,8 @@
         // Skip inline assembly calls.
         if (CI && CI->isInlineAsm())
           continue;
-        // Skip direct calls.
-        if (!CS.getCalledValue() || isa<Constant>(CS.getCalledValue()))
-          continue;
+        assert(CalledValue && !isa<Constant>(CalledValue) &&
+               "Expected indirect call");
 
         uint32_t NumVals, NumCandidates;
         uint64_t TotalCount;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D39356.121771.patch
Type: text/x-patch
Size: 2415 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171106/027ad33f/attachment.bin>


More information about the llvm-commits mailing list