diff options
| -rw-r--r-- | llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 10 | ||||
| -rw-r--r-- | llvm/test/Transforms/SimplifyCFG/sink-common-code.ll | 23 |
2 files changed, 33 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 3404a4dfdda..3de6c6069a8 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1424,6 +1424,16 @@ static bool canSinkInstructions( // FIXME: if the call was *already* indirect, we should do this. return false; } + // Because SROA can't handle speculating stores of selects, try not + // to sink stores of allocas when we'd have to create a PHI for the + // address operand. + // FIXME: This is a workaround for a deficiency in SROA - see + // https://llvm.org/bugs/show_bug.cgi?id=30188 + if (OI == 1 && isa<StoreInst>(I0) && + any_of(Insts, [](const Instruction *I) { + return isa<AllocaInst>(I->getOperand(1)); + })) + return false; for (auto *I : Insts) PHIOperands[I].push_back(I->getOperand(OI)); } diff --git a/llvm/test/Transforms/SimplifyCFG/sink-common-code.ll b/llvm/test/Transforms/SimplifyCFG/sink-common-code.ll index 1a4884a6454..9f87d3bf3c5 100644 --- a/llvm/test/Transforms/SimplifyCFG/sink-common-code.ll +++ b/llvm/test/Transforms/SimplifyCFG/sink-common-code.ll @@ -537,6 +537,29 @@ if.end: ; CHECK-DAG: [ %cmp3, %if.then3 ] ; CHECK-NEXT: zext i1 %[[x]] to i8 +define i32 @test_pr30188(i1 zeroext %flag, i32 %x) { +entry: + %y = alloca i32 + %z = alloca i32 + br i1 %flag, label %if.then, label %if.else + +if.then: + store i32 %x, i32* %y + br label %if.end + +if.else: + store i32 %x, i32* %z + br label %if.end + +if.end: + ret i32 1 +} + +; CHECK-LABEL: test_pr30188 +; CHECK-NOT: select +; CHECK: store +; CHECK: store + ; CHECK: !0 = !{!1, !1, i64 0} ; CHECK: !1 = !{!"float", !2} ; CHECK: !2 = !{!"an example type tree"} |
