[PATCH] D105309: [InstCombine] Don't combine PHI before catchswitch
Heejin Ahn via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri Jul 2 00:33:14 PDT 2021
aheejin updated this revision to Diff 356114.
aheejin marked 3 inline comments as done.
aheejin added a comment.
Address comments
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D105309/new/
https://reviews.llvm.org/D105309
Files:
llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp
llvm/test/Transforms/InstCombine/catchswitch-phi.ll
Index: llvm/test/Transforms/InstCombine/catchswitch-phi.ll
===================================================================
--- /dev/null
+++ llvm/test/Transforms/InstCombine/catchswitch-phi.ll
@@ -0,0 +1,53 @@
+; RUN: opt < %s -instcombine -S | FileCheck %s
+
+target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128-ni:1"
+target triple = "wasm32-unknown-unknown"
+
+%struct.quux = type { i32 }
+%struct.blam = type <{ %struct.quux }>
+
+declare void @foo()
+declare void @bar(%struct.quux*)
+declare i32 @__gxx_wasm_personality_v0(...)
+
+define void @test() personality i8* bitcast (i32 (...)* @__gxx_wasm_personality_v0 to i8*) {
+bb:
+ %tmp0 = alloca %struct.blam, align 4
+ br i1 undef, label %bb1, label %bb2
+
+bb1: ; preds = %bb
+ %tmp1 = getelementptr inbounds %struct.blam, %struct.blam* %tmp0, i32 0, i32 0
+ invoke void @foo()
+ to label %bb3 unwind label %bb4
+
+bb2: ; preds = %bb
+ %tmp2 = getelementptr inbounds %struct.blam, %struct.blam* %tmp0, i32 0, i32 0
+ invoke void @foo()
+ to label %bb3 unwind label %bb4
+
+bb3: ; preds = %bb2, %bb1
+ unreachable
+
+bb4: ; preds = %bb2, %bb1
+ ; This PHI should not be combined into a non-PHI instruction, because
+ ; catchswitch BB cannot have any non-PHI instruction other than catchswitch
+ ; itself.
+ ; CHECK: bb4:
+ ; CHECK-NEXT: phi
+ ; CHECK-NEXT: catchswitch
+ %tmp3 = phi %struct.quux* [ %tmp1, %bb1 ], [ %tmp2, %bb2 ]
+ %tmp4 = catchswitch within none [label %bb5] unwind label %bb7
+
+bb5: ; preds = %bb4
+ %tmp5 = catchpad within %tmp4 [i8* null]
+ invoke void @foo() [ "funclet"(token %tmp5) ]
+ to label %bb6 unwind label %bb7
+
+bb6: ; preds = %bb5
+ unreachable
+
+bb7: ; preds = %bb5, %bb4
+ %tmp6 = cleanuppad within none []
+ call void @bar(%struct.quux* %tmp3) [ "funclet"(token %tmp6) ]
+ unreachable
+}
Index: llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp
===================================================================
--- llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp
+++ llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp
@@ -1326,6 +1326,7 @@
SmallPtrSet<Value *, 4> CheckedIVs;
CheckedIVs.insert(IV0);
if (IV0 != IV0Stripped &&
+ PN.getParent()->getFirstInsertionPt() != PN.getParent()->end() &&
all_of(PN.incoming_values(), [&CheckedIVs, IV0Stripped](Value *IV) {
return !CheckedIVs.insert(IV).second ||
IV0Stripped == IV->stripPointerCasts();
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D105309.356114.patch
Type: text/x-patch
Size: 2774 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210702/136cbfe2/attachment.bin>
More information about the llvm-commits
mailing list