[PATCH] D152434: [BBUtils] Don't add 'then' block to a loop if it's terminated with unreachable

[Dmitry Makogon 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 rGd46d9689f7c3: [BBUtils] Don't add 'then' block to a loop if it's terminated with unreachable (authored by dmakogon).

Changed prior to commit:
  https://reviews.llvm.org/D152434?vs=529559&id=532630#toc

Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D152434

Files:
  llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
  llvm/test/Transforms/SimpleLoopUnswitch/guards.ll
  llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll


Index: llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll
===================================================================
--- llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll
+++ llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-skip-selects-in-guards.ll
@@ -7,9 +7,6 @@
 declare void @llvm.experimental.guard(i1, ...)
 declare void @widget()
 
-; XFAIL: *
-; REQUIRES: asserts
-
 define void @foo(ptr addrspace(1) %arg, i64 %arg1) personality ptr @pluto {
 ; CHECK-LABEL: @foo(
 ; CHECK-NEXT:  bb:
Index: llvm/test/Transforms/SimpleLoopUnswitch/guards.ll
===================================================================
--- llvm/test/Transforms/SimpleLoopUnswitch/guards.ll
+++ llvm/test/Transforms/SimpleLoopUnswitch/guards.ll
@@ -2,9 +2,6 @@
 ; RUN: opt -passes='simple-loop-unswitch<nontrivial>' -simple-loop-unswitch-guards -S < %s | FileCheck %s
 ; RUN: opt -passes='loop-mssa(simple-loop-unswitch<nontrivial>),verify<loops>' -simple-loop-unswitch-guards  -verify-memoryssa -verify-loop-info -S < %s | FileCheck %s
 
-; XFAIL: *
-; REQUIRES: asserts
-
 declare void @llvm.experimental.guard(i1, ...)
 
 define void @test_simple_case(i1 %cond, i32 %N) {
Index: llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
===================================================================
--- llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
+++ llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
@@ -1518,7 +1518,9 @@
 
   if (LI) {
     if (Loop *L = LI->getLoopFor(Head)) {
-      L->addBasicBlockToLoop(ThenBlock, *LI);
+      // unreachable-terminated blocks cannot belong to any loop.
+      if (!Unreachable)
+        L->addBasicBlockToLoop(ThenBlock, *LI);
       L->addBasicBlockToLoop(Tail, *LI);
     }
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D152434.532630.patch
Type: text/x-patch
Size: 1791 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230619/a196beb9/attachment.bin>