[PATCH] D121722: [AlwaysInliner] Check inliner errors even without assserts

[Ellis Hoag via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG84c6689b1511: [AlwaysInliner] Check inliner errors even without assserts (authored by ellis).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D121722/new/

https://reviews.llvm.org/D121722

Files:
  llvm/lib/Transforms/IPO/AlwaysInliner.cpp
  llvm/test/Transforms/Inline/always-inline-remark.ll


Index: llvm/test/Transforms/Inline/always-inline-remark.ll
===================================================================
--- /dev/null
+++ llvm/test/Transforms/Inline/always-inline-remark.ll
@@ -0,0 +1,20 @@
+; RUN: opt -passes="always-inline" -pass-remarks-missed=inline -S < %s 2>&1 | FileCheck %s
+
+declare void @personalityFn1();
+declare void @personalityFn2();
+
+define void @foo() alwaysinline {
+    ret void
+}
+
+define void @bar() alwaysinline personality void ()* @personalityFn1 {
+    ret void
+}
+
+define void @goo() personality void ()* @personalityFn2 {
+    ; CHECK-DAG: 'bar' is not inlined into 'goo': incompatible personality
+    call void @bar()
+    ; CHECK-DAG: 'foo' is not inlined into 'goo': unsupported operand bundle
+    call void @foo() [ "CUSTOM_OPERAND_BUNDLE"() ]
+    ret void
+}
Index: llvm/lib/Transforms/IPO/AlwaysInliner.cpp
===================================================================
--- llvm/lib/Transforms/IPO/AlwaysInliner.cpp
+++ llvm/lib/Transforms/IPO/AlwaysInliner.cpp
@@ -75,18 +75,28 @@
             },
             ORE);
         assert(OIC);
-        emitInlinedIntoBasedOnCost(ORE, CB->getDebugLoc(), CB->getParent(), F,
-                                   *Caller, *OIC, false, DEBUG_TYPE);
+        DebugLoc DLoc = CB->getDebugLoc();
+        BasicBlock *Block = CB->getParent();
+        emitInlinedIntoBasedOnCost(ORE, DLoc, Block, F, *Caller, *OIC, false,
+                                   DEBUG_TYPE);
 
         InlineFunctionInfo IFI(
             /*cg=*/nullptr, GetAssumptionCache, &PSI,
-            &FAM.getResult<BlockFrequencyAnalysis>(*(CB->getCaller())),
+            &FAM.getResult<BlockFrequencyAnalysis>(*Caller),
             &FAM.getResult<BlockFrequencyAnalysis>(F));
 
         InlineResult Res = InlineFunction(
             *CB, IFI, &FAM.getResult<AAManager>(F), InsertLifetime);
-        assert(Res.isSuccess() && "unexpected failure to inline");
-        (void)Res;
+        if (!Res.isSuccess()) {
+          ORE.emit([&]() {
+            return OptimizationRemarkMissed(DEBUG_TYPE, "NotInlined", DLoc,
+                                            Block)
+                   << "'" << ore::NV("Callee", &F) << "' is not inlined into '"
+                   << ore::NV("Caller", Caller)
+                   << "': " << ore::NV("Reason", Res.getFailureReason());
+          });
+          continue;
+        }
 
         // Merge the attributes based on the inlining.
         AttributeFuncs::mergeAttributesForInlining(*Caller, F);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D121722.416227.patch
Type: text/x-patch
Size: 2531 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220317/cd4f8565/attachment.bin>