[PATCH] D106405: [NewPM][Inliner] Check if deleted function is in current SCC

[Arthur Eubanks 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 rG8bc298d041fb: [NewPM][Inliner] Check if deleted function is in current SCC (authored by aeubanks).

Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D106405

Files:
  llvm/lib/Transforms/IPO/Inliner.cpp
  llvm/test/Transforms/Inline/deleted-scc.ll


Index: llvm/test/Transforms/Inline/deleted-scc.ll
===================================================================
--- /dev/null
+++ llvm/test/Transforms/Inline/deleted-scc.ll
@@ -0,0 +1,54 @@
+; RUN: opt -passes=inline < %s -S | FileCheck %s
+
+; CHECK-NOT: define
+; CHECK: define void @e()
+; CHECK-NOT: define
+
+ at b = external local_unnamed_addr global i32, align 4
+
+define void @e() local_unnamed_addr {
+entry:
+  call fastcc void @d()
+  ret void
+}
+
+define internal fastcc void @f() unnamed_addr {
+entry:
+  call fastcc void @d()
+  ret void
+}
+
+define internal fastcc void @d() unnamed_addr {
+entry:
+  br label %L
+
+L:                                                ; preds = %cleanup9, %entry
+  %cleanup.dest.slot.0 = phi i32 [ undef, %entry ], [ %cleanup.dest.slot.3, %cleanup9 ]
+  store i32 0, i32* @b, align 4
+  %tobool.not = icmp eq i32 0, 0
+  br i1 %tobool.not, label %if.then, label %while.cond
+
+while.cond:                                       ; preds = %cleanup9, %L
+  %cleanup.dest.slot.2 = phi i32 [ %cleanup.dest.slot.0, %L ], [ 0, %cleanup9 ]
+  %0 = load i32, i32* @b, align 4
+  %tobool3.not = icmp eq i32 %0, 0
+  br i1 %tobool3.not, label %cleanup9, label %while.body4
+
+while.body4:                                      ; preds = %while.cond
+  call fastcc void @f()
+  br label %cleanup9
+
+cleanup9:                                         ; preds = %while.cond, %while.body4
+  %cleanup.dest.slot.3 = phi i32 [ %cleanup.dest.slot.2, %while.body4 ], [ 0, %while.cond ]
+  switch i32 %cleanup.dest.slot.3, label %common.ret [
+    i32 0, label %while.cond
+    i32 2, label %L
+  ]
+
+common.ret:                                       ; preds = %cleanup9, %if.then
+  ret void
+
+if.then:                                          ; preds = %L
+  call void @e()
+  br label %common.ret
+}
Index: llvm/lib/Transforms/IPO/Inliner.cpp
===================================================================
--- llvm/lib/Transforms/IPO/Inliner.cpp
+++ llvm/lib/Transforms/IPO/Inliner.cpp
@@ -1127,6 +1127,10 @@
     UR.InvalidatedSCCs.insert(&DeadC);
     UR.InvalidatedRefSCCs.insert(&DeadRC);
 
+    // If the updated SCC was the one containing the deleted function, clear it.
+    if (&DeadC == UR.UpdatedC)
+      UR.UpdatedC = nullptr;
+
     // And delete the actual function from the module.
     // The Advisor may use Function pointers to efficiently index various
     // internal maps, e.g. for memoization. Function cleanup passes like


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D106405.360482.patch
Type: text/x-patch
Size: 2489 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210721/80ff4ec8/attachment.bin>