[PATCH] D32373: [PartialInliner] Do not do partial inlining for functions with non-call references

[David Li via Phabricator via llvm-commits]

davidxl created this revision.

This patch fixes another bug found when enabling partial inlining.  The partial inliner does not check if the use of the function is a call use or not and blindly replace uses and forces inlining (of the wrong target). It can cause crashes during compile (e.g. with the test case)


https://reviews.llvm.org/D32373

Files:
  lib/Transforms/IPO/PartialInlining.cpp
  test/Transforms/CodeExtractor/PartialInlineCallRef.ll


Index: test/Transforms/CodeExtractor/PartialInlineCallRef.ll
===================================================================
--- test/Transforms/CodeExtractor/PartialInlineCallRef.ll
+++ test/Transforms/CodeExtractor/PartialInlineCallRef.ll
@@ -0,0 +1,56 @@
+; RUN: opt < %s -partial-inliner -S  | FileCheck %s
+; RUN: opt < %s -passes=partial-inliner -S  | FileCheck %s
+
+
+; Function Attrs: nounwind
+declare void @foo(...) local_unnamed_addr #0
+
+; Function Attrs: noinline
+define i32 @caller(i32 (i32)* nocapture %arg, i32 (i32)* nocapture %arg1, i32 %arg2) local_unnamed_addr #1 {
+bb:
+  %tmp = tail call i32 %arg(i32 %arg2) #0
+  %tmp3 = tail call i32 %arg1(i32 %arg2) #0
+  %tmp4 = add nsw i32 %tmp3, %tmp
+  ret i32 %tmp4
+}
+
+; Function Attrs: nounwind
+define i32 @bar(i32 %arg) #0 {
+bb:
+  %tmp = icmp slt i32 %arg, 0
+  br i1 %tmp, label %bb1, label %bb2
+
+bb1:                                              ; preds = %bb
+  tail call void (...) @foo() #0
+  tail call void (...) @foo() #0
+  tail call void (...) @foo() #0
+  tail call void (...) @foo() #0
+  tail call void (...) @foo() #0
+  tail call void (...) @foo() #0
+  tail call void (...) @foo() #0
+  tail call void (...) @foo() #0
+  tail call void (...) @foo() #0
+  br label %bb2
+
+bb2:                                              ; preds = %bb1, %bb
+  %tmp3 = phi i32 [ 0, %bb1 ], [ 1, %bb ]
+  ret i32 %tmp3
+}
+
+; Function Attrs: nounwind
+define i32 @dummy_caller(i32 %arg) local_unnamed_addr #0 {
+bb:
+; CHECK-LABEL: @dummy_caller
+; check that caller is not wrongly inlined by partial inliner
+; CHECK: call i32 @caller
+; CHECK-NOT: call .* @bar
+  %tmp = tail call i32 @caller(i32 (i32)* nonnull @bar, i32 (i32)* nonnull @bar, i32 %arg)
+  ret i32 %tmp
+}
+
+attributes #0 = { nounwind }
+attributes #1 = { noinline }
+
+!llvm.ident = !{!0}
+
+!0 = !{!"clang version 5.0.0 (trunk 300897) (llvm/trunk 300947)"}
Index: lib/Transforms/IPO/PartialInlining.cpp
===================================================================
--- lib/Transforms/IPO/PartialInlining.cpp
+++ lib/Transforms/IPO/PartialInlining.cpp
@@ -85,6 +85,26 @@
   if (ReturnCount != 1)
     return nullptr;
 
+  auto canAllUsesBeReplaced = [](Function *F) {
+    std::vector<User *> Users(F->user_begin(), F->user_end());
+    for (User *User : Users) {
+      Function *Callee = nullptr;
+      if (CallInst *CI = dyn_cast<CallInst>(User))
+        Callee = CallSite(CI).getCalledFunction();
+      else if (InvokeInst *II = dyn_cast<InvokeInst>(User))
+        Callee = CallSite(II).getCalledFunction();
+      else
+        return false;
+      if (Callee != F)
+        return false;
+    }
+
+    return true;
+  };
+
+  if (!canAllUsesBeReplaced(F))
+    return nullptr;
+
   // Clone the function, so that we can hack away on it.
   ValueToValueMapTy VMap;
   Function *DuplicateFunction = CloneFunction(F, VMap);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D32373.96226.patch
Type: text/x-patch
Size: 2889 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170421/a4309da4/attachment.bin>