[PATCH] D101036: [WebAssembly] Fix fixEndsAtEndOfFunction for delegate
Heejin Ahn via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 22 15:32:27 PDT 2021
This revision was automatically updated to reflect the committed changes.
Closed by commit rGc390621aeb82: [WebAssembly] Fix fixEndsAtEndOfFunction for delegate (authored by aheejin).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D101036/new/
https://reviews.llvm.org/D101036
Files:
llvm/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp
llvm/test/CodeGen/WebAssembly/cfg-stackify-eh.mir
Index: llvm/test/CodeGen/WebAssembly/cfg-stackify-eh.mir
===================================================================
--- llvm/test/CodeGen/WebAssembly/cfg-stackify-eh.mir
+++ llvm/test/CodeGen/WebAssembly/cfg-stackify-eh.mir
@@ -9,6 +9,9 @@
define void @rethrow_arg_test() personality i8* bitcast (i32 (...)* @__gxx_wasm_personality_v0 to i8*) {
ret void
}
+ define i32 @fix_end_function_test() personality i8* bitcast (i32 (...)* @__gxx_wasm_personality_v0 to i8*) {
+ ret i32 0
+ }
...
---
@@ -43,7 +46,7 @@
; CHECK: bb.2 (landing-pad):
; CHECK: CATCH
; CHECK: RETHROW 0
- EH_LABEL <mcsymbol .Ltmp5>
+ EH_LABEL <mcsymbol .Ltmp3>
%1:i32 = CATCH &__cpp_exception, implicit-def dead $arguments
RETHROW 0, implicit-def dead $arguments
@@ -53,3 +56,61 @@
; CHECK: END_TRY
RETURN implicit-def dead $arguments
...
+
+---
+# This function has i32 return type and the end of the function is unreachable,
+# so CFGStackify's fixEndsAtEndOfFunction() propagates the return type while
+# they encounter 'end' or 'delegate'. This is a regression test for a bug that
+# we only handled 'end' but not 'delegate'.
+# CHECK-LABEL: name: fix_end_function_test
+name: fix_end_function_test
+liveins:
+ - { reg: '$arguments' }
+machineFunctionInfo:
+ params: [ ]
+ results: [ i32 ]
+ wasmEHFuncInfo:
+ 3: 4
+body: |
+ ; CHECK: TRY 127
+ ; CHECK: TRY 127
+ ; CHECK: CALL @foo
+ ; CHECK: TRY 64
+ ; CHECK: CALL @foo
+ ; CHECK: DELEGATE
+ ; CHECK: RETURN
+ ; CHECK: CATCH
+ ;; This TRY should have the return type i32 (127)
+ ; CHECK: TRY 127
+ ; CHECK: RETHROW
+ ; CHECK: DELEGATE
+ ; CHECK: END_TRY
+ ; CHECK: CATCH
+ ; CHECK: RETHROW
+ ; CHECK: END_TRY
+ bb.0:
+ successors: %bb.1, %bb.3
+ EH_LABEL <mcsymbol .Ltmp0>
+ CALL @foo, implicit-def dead $arguments, implicit $sp32, implicit $sp64
+ EH_LABEL <mcsymbol .Ltmp1>
+
+ bb.1:
+ successors: %bb.2, %bb.4
+ EH_LABEL <mcsymbol .Ltmp2>
+ CALL @foo, implicit-def dead $arguments, implicit $sp32, implicit $sp64
+ EH_LABEL <mcsymbol .Ltmp3>
+
+ bb.2:
+ %0:i32 = CONST_I32 3, implicit-def dead $arguments
+ RETURN %0:i32, implicit-def dead $arguments
+
+ bb.3 (landing-pad):
+ EH_LABEL <mcsymbol .Ltmp4>
+ %0:i32 = CATCH &__cpp_exception, implicit-def dead $arguments
+ RETHROW 0, implicit-def dead $arguments
+
+ bb.4 (landing-pad):
+ EH_LABEL <mcsymbol .Ltmp5>
+ %1:i32 = CATCH &__cpp_exception, implicit-def dead $arguments
+ RETHROW 0, implicit-def dead $arguments
+...
Index: llvm/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp
===================================================================
--- llvm/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp
+++ llvm/lib/Target/WebAssembly/WebAssemblyCFGStackify.cpp
@@ -1524,6 +1524,7 @@
}
case WebAssembly::END_BLOCK:
case WebAssembly::END_LOOP:
+ case WebAssembly::DELEGATE:
EndToBegin[&MI]->getOperand(0).setImm(int32_t(RetType));
continue;
default:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D101036.339803.patch
Type: text/x-patch
Size: 3113 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210422/6ff3736e/attachment-0001.bin>
More information about the llvm-commits
mailing list