[PATCH] D81674: Fixed assertion in SROA if block has ho successors

[Stanislav Mekhanoshin via Phabricator via llvm-commits]

rampitec updated this revision to Diff 270241.
rampitec marked an inline comment as done.

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

https://reviews.llvm.org/D81674

Files:
  llvm/lib/Transforms/Scalar/SROA.cpp
  llvm/test/Transforms/SROA/phi-gep.ll


Index: llvm/test/Transforms/SROA/phi-gep.ll
===================================================================
--- llvm/test/Transforms/SROA/phi-gep.ll
+++ llvm/test/Transforms/SROA/phi-gep.ll
@@ -416,6 +416,42 @@
   ret i32 %load
 }
 
+define void @unreachable_term() {
+; CHECK-LABEL: @unreachable_term(
+; CHECK-NEXT:    [[A_SROA_0:%.*]] = alloca i32, align 4
+; CHECK-NEXT:    [[A_SROA_0_0_A_SROA_CAST1:%.*]] = bitcast i32* [[A_SROA_0]] to [3 x i32]*
+; CHECK-NEXT:    unreachable
+; CHECK:       bb1:
+; CHECK-NEXT:    br label [[BB1_I:%.*]]
+; CHECK:       bb1.i:
+; CHECK-NEXT:    [[PHI:%.*]] = phi [3 x i32]* [ [[A_SROA_0_0_A_SROA_CAST1]], [[BB1:%.*]] ], [ null, [[BB1_I]] ]
+; CHECK-NEXT:    [[GEP:%.*]] = getelementptr [3 x i32], [3 x i32]* [[PHI]], i64 0, i64 0
+; CHECK-NEXT:    store i32 0, i32* [[GEP]], align 1
+; CHECK-NEXT:    br i1 undef, label [[BB1_I]], label [[EXIT:%.*]]
+; CHECK:       exit:
+; CHECK-NEXT:    br label [[BB2:%.*]]
+; CHECK:       bb2:
+; CHECK-NEXT:    ret void
+;
+  %a = alloca [3 x i32], align 1
+  unreachable
+
+bb1:
+  br label %bb1.i
+
+bb1.i:
+  %phi = phi [3 x i32]* [ %a, %bb1 ], [ null, %bb1.i ]
+  %gep = getelementptr [3 x i32], [3 x i32]* %phi, i64 0, i64 0
+  store i32 0, i32* %gep, align 1
+  br i1 undef, label %bb1.i, label %exit
+
+exit:
+  br label %bb2
+
+bb2:
+  ret void
+}
+
 declare %pair* @foo()
 
 declare i32 @__gxx_personality_v0(...)
Index: llvm/lib/Transforms/Scalar/SROA.cpp
===================================================================
--- llvm/lib/Transforms/Scalar/SROA.cpp
+++ llvm/lib/Transforms/Scalar/SROA.cpp
@@ -3481,6 +3481,7 @@
         llvm::any_of(PHI->incoming_values(), [](Value *In)
           { Instruction *I = dyn_cast<Instruction>(In);
             return !I || isa<GetElementPtrInst>(I) || isa<PHINode>(I) ||
+                   succ_empty(I->getParent()) ||
                    !I->getParent()->isLegalToHoistInto();
           }))
       return false;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D81674.270241.patch
Type: text/x-patch
Size: 1955 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200611/c974ba6d/attachment.bin>