2018-06-01 06:02:34 +08:00
|
|
|
; RUN: opt < %s -winehprepare -demote-catchswitch-only -wasmehprepare -S | FileCheck %s
|
|
|
|
|
|
|
|
target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
|
|
|
|
target triple = "wasm32-unknown-unknown"
|
|
|
|
|
|
|
|
; CHECK: @__wasm_lpad_context = external global { i32, i8*, i32 }
|
|
|
|
|
|
|
|
@_ZTIi = external constant i8*
|
2019-02-26 11:29:59 +08:00
|
|
|
%struct.Temp = type { i8 }
|
2018-06-01 06:02:34 +08:00
|
|
|
|
|
|
|
; A single 'catch (int)' clause.
|
|
|
|
; A wasm.catch() call, wasm.lsda() call, and personality call to generate a
|
|
|
|
; selector should all be genereated after the catchpad.
|
2019-02-26 11:29:59 +08:00
|
|
|
;
|
|
|
|
; void foo();
|
|
|
|
; void test0() {
|
|
|
|
; try {
|
|
|
|
; foo();
|
|
|
|
; } catch (int) {
|
|
|
|
; }
|
|
|
|
; }
|
2018-06-01 06:02:34 +08:00
|
|
|
define void @test0() personality i8* bitcast (i32 (...)* @__gxx_wasm_personality_v0 to i8*) {
|
|
|
|
; CHECK-LABEL: @test0()
|
|
|
|
entry:
|
|
|
|
invoke void @foo()
|
|
|
|
to label %try.cont unwind label %catch.dispatch
|
|
|
|
|
|
|
|
catch.dispatch: ; preds = %entry
|
|
|
|
%0 = catchswitch within none [label %catch.start] unwind to caller
|
|
|
|
|
|
|
|
catch.start: ; preds = %catch.dispatch
|
|
|
|
%1 = catchpad within %0 [i8* bitcast (i8** @_ZTIi to i8*)]
|
|
|
|
%2 = call i8* @llvm.wasm.get.exception(token %1)
|
|
|
|
%3 = call i32 @llvm.wasm.get.ehselector(token %1)
|
|
|
|
%4 = call i32 @llvm.eh.typeid.for(i8* bitcast (i8** @_ZTIi to i8*))
|
|
|
|
%matches = icmp eq i32 %3, %4
|
|
|
|
br i1 %matches, label %catch, label %rethrow
|
|
|
|
; CHECK: catch.start:
|
|
|
|
; CHECK-NEXT: %[[CATCHPAD:.*]] = catchpad
|
[WebAssembly] Exception handling: Switch to the new proposal
Summary:
This switches the EH implementation to the new proposal:
https://github.com/WebAssembly/exception-handling/blob/master/proposals/Exceptions.md
(The previous proposal was
https://github.com/WebAssembly/exception-handling/blob/master/proposals/old/Exceptions.md)
- Instruction changes
- Now we have one single `catch` instruction that returns a except_ref
value
- `throw` now can take variable number of operations
- `rethrow` does not have 'depth' argument anymore
- `br_on_exn` queries an except_ref to see if it matches the tag and
branches to the given label if true.
- `extract_exception` is a pseudo instruction that simulates popping
values from wasm stack. This is to make `br_on_exn`, a very special
instruction, work: `br_on_exn` puts values onto the stack only if it
is taken, and the # of values can vay depending on the tag.
- Now there's only one `catch` per `try`, this patch removes all special
handling for terminate pad with a call to `__clang_call_terminate`.
Before it was the only case there are two catch clauses (a normal
`catch` and `catch_all` per `try`).
- Make `rethrow` act as a terminator like `throw`. This splits BB after
`rethrow` in WasmEHPrepare, and deletes an unnecessary `unreachable`
after `rethrow` in LateEHPrepare.
- Now we stop at all catchpads (because we add wasm `catch` instruction
that catches all exceptions), this creates new
`findWasmUnwindDestinations` function in SelectionDAGBuilder.
- Now we use `br_on_exn` instrution to figure out if an except_ref
matches the current tag or not, LateEHPrepare generates this sequence
for catch pads:
```
catch
block i32
br_on_exn $__cpp_exception
end_block
extract_exception
```
- Branch analysis for `br_on_exn` in WebAssemblyInstrInfo
- Other various misc. changes to switch to the new proposal.
Reviewers: dschuff
Subscribers: sbc100, jgravelle-google, sunfish, llvm-commits
Differential Revision: https://reviews.llvm.org/D57134
llvm-svn: 352598
2019-01-30 11:21:57 +08:00
|
|
|
; CHECK-NEXT: %[[EXN:.*]] = call i8* @llvm.wasm.extract.exception()
|
Reland "[WebAssembly] LSDA info generation"
Summary:
This adds support for LSDA (exception table) generation for wasm EH.
Wasm EH mostly follows the structure of Itanium-style exception tables,
with one exception: a call site table entry in wasm EH corresponds to
not a call site but a landing pad.
In wasm EH, the VM is responsible for stack unwinding. After an
exception occurs and the stack is unwound, the control flow is
transferred to wasm 'catch' instruction by the VM, after which the
personality function is called from the compiler-generated code. (Refer
to WasmEHPrepare pass for more information on this part.)
This patch:
- Changes wasm.landingpad.index intrinsic to take a token argument, to
make this 1:1 match with a catchpad instruction
- Stores landingpad index info and catch type info MachineFunction in
before instruction selection
- Lowers wasm.lsda intrinsic to an MCSymbol pointing to the start of an
exception table
- Adds WasmException class with overridden methods for table generation
- Adds support for LSDA section in Wasm object writer
Reviewers: dschuff, sbc100, rnk
Subscribers: mgorny, jgravelle-google, sunfish, llvm-commits
Differential Revision: https://reviews.llvm.org/D52748
llvm-svn: 345345
2018-10-26 07:55:10 +08:00
|
|
|
; CHECK-NEXT: call void @llvm.wasm.landingpad.index(token %[[CATCHPAD]], i32 0)
|
2018-06-01 06:02:34 +08:00
|
|
|
; CHECK-NEXT: store i32 0, i32* getelementptr inbounds ({ i32, i8*, i32 }, { i32, i8*, i32 }* @__wasm_lpad_context, i32 0, i32 0)
|
|
|
|
; CHECK-NEXT: %[[LSDA:.*]] = call i8* @llvm.wasm.lsda()
|
|
|
|
; CHECK-NEXT: store i8* %[[LSDA]], i8** getelementptr inbounds ({ i32, i8*, i32 }, { i32, i8*, i32 }* @__wasm_lpad_context, i32 0, i32 1)
|
|
|
|
; CHECK-NEXT: call i32 @_Unwind_CallPersonality(i8* %[[EXN]]) {{.*}} [ "funclet"(token %[[CATCHPAD]]) ]
|
|
|
|
; CHECK-NEXT: %[[SELECTOR:.*]] = load i32, i32* getelementptr inbounds ({ i32, i8*, i32 }, { i32, i8*, i32 }* @__wasm_lpad_context, i32 0, i32 2)
|
|
|
|
; CHECK: icmp eq i32 %[[SELECTOR]]
|
|
|
|
|
|
|
|
catch: ; preds = %catch.start
|
|
|
|
%5 = call i8* @__cxa_begin_catch(i8* %2) [ "funclet"(token %1) ]
|
|
|
|
call void @__cxa_end_catch() [ "funclet"(token %1) ]
|
|
|
|
catchret from %1 to label %try.cont
|
|
|
|
; CHECK: catch:
|
|
|
|
; CHECK-NEXT: call i8* @__cxa_begin_catch(i8* %[[EXN]])
|
|
|
|
|
|
|
|
rethrow: ; preds = %catch.start
|
[WebAssembly] Make rethrow take an except_ref type argument
Summary:
In the new wasm EH proposal, `rethrow` takes an `except_ref` argument.
This change was missing in r352598.
This patch adds `llvm.wasm.rethrow.in.catch` intrinsic. This is an
intrinsic that's gonna eventually be lowered to wasm `rethrow`
instruction, but this intrinsic can appear only within a catchpad or a
cleanuppad scope. Also this intrinsic needs to be invokable - otherwise
EH pad successor for it will not be correctly generated in clang.
This also adds lowering logic for this intrinsic in
`SelectionDAGBuilder::visitInvoke`. This routine is basically a
specialized and simplified version of
`SelectionDAGBuilder::visitTargetIntrinsic`, but we can't use it
because if is only for `CallInst`s.
This deletes the previous `llvm.wasm.rethrow` intrinsic and related
tests, which was meant to be used within a `__cxa_rethrow` library
function. Turned out this needs some more logic, so the intrinsic for
this purpose will be added later.
LateEHPrepare takes a result value of `catch` and inserts it into
matching `rethrow` as an argument.
`RETHROW_IN_CATCH` is a pseudo instruction that serves as a link between
`llvm.wasm.rethrow.in.catch` and the real wasm `rethrow` instruction. To
generate a `rethrow` instruction, we need an `except_ref` argument,
which is generated from `catch` instruction. But `catch` instrutions are
added in LateEHPrepare pass, so we use `RETHROW_IN_CATCH`, which takes
no argument, until we are able to correctly lower it to `rethrow` in
LateEHPrepare.
Reviewers: dschuff
Subscribers: sbc100, jgravelle-google, sunfish, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D59352
llvm-svn: 356316
2019-03-16 13:38:57 +08:00
|
|
|
call void @llvm.wasm.rethrow.in.catch() [ "funclet"(token %1) ]
|
2018-06-01 06:02:34 +08:00
|
|
|
unreachable
|
|
|
|
|
|
|
|
try.cont: ; preds = %entry, %catch
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
|
2019-02-26 11:29:59 +08:00
|
|
|
; Two try-catches.
|
2018-06-01 06:02:34 +08:00
|
|
|
; For the catchpad with a single 'catch (...)', only a wasm.catch() call should
|
|
|
|
; be generated after the catchpad; wasm.landingpad.index() and personality call
|
|
|
|
; should NOT be generated. For the other catchpad, the argument of
|
|
|
|
; wasm.landingpad.index() should be not 1 but 0.
|
2019-02-26 11:29:59 +08:00
|
|
|
;
|
|
|
|
; void foo();
|
|
|
|
; void test1() {
|
|
|
|
; try {
|
|
|
|
; foo();
|
|
|
|
; } catch (...) {
|
|
|
|
; }
|
|
|
|
; try {
|
|
|
|
; foo();
|
|
|
|
; } catch (int) {
|
|
|
|
; }
|
|
|
|
; }
|
2018-06-01 06:02:34 +08:00
|
|
|
define void @test1() personality i8* bitcast (i32 (...)* @__gxx_wasm_personality_v0 to i8*) {
|
|
|
|
; CHECK-LABEL: @test1()
|
|
|
|
entry:
|
|
|
|
invoke void @foo()
|
|
|
|
to label %try.cont unwind label %catch.dispatch
|
|
|
|
|
|
|
|
catch.dispatch: ; preds = %entry
|
|
|
|
%0 = catchswitch within none [label %catch.start] unwind to caller
|
|
|
|
|
|
|
|
catch.start: ; preds = %catch.dispatch
|
|
|
|
%1 = catchpad within %0 [i8* null]
|
|
|
|
%2 = call i8* @llvm.wasm.get.exception(token %1)
|
|
|
|
%3 = call i32 @llvm.wasm.get.ehselector(token %1)
|
|
|
|
%4 = call i8* @__cxa_begin_catch(i8* %2) [ "funclet"(token %1) ]
|
|
|
|
call void @__cxa_end_catch() [ "funclet"(token %1) ]
|
|
|
|
catchret from %1 to label %try.cont
|
|
|
|
; CHECK: catch.start:
|
|
|
|
; CHECK-NEXT: catchpad within %0 [i8* null]
|
|
|
|
; CHECK-NOT: call void @llvm.wasm.landingpad.index
|
|
|
|
; CHECK-NOT: store {{.*}} @__wasm_lpad_context
|
|
|
|
; CHECK-NOT: call i8* @llvm.wasm.lsda()
|
|
|
|
; CHECK-NOT: call i32 @_Unwind_CallPersonality
|
|
|
|
; CHECK-NOT: load {{.*}} @__wasm_lpad_context
|
|
|
|
|
|
|
|
try.cont: ; preds = %entry, %catch.start
|
|
|
|
invoke void @foo()
|
|
|
|
to label %try.cont7 unwind label %catch.dispatch2
|
|
|
|
|
|
|
|
catch.dispatch2: ; preds = %try.cont
|
|
|
|
%5 = catchswitch within none [label %catch.start3] unwind to caller
|
|
|
|
|
|
|
|
catch.start3: ; preds = %catch.dispatch2
|
|
|
|
%6 = catchpad within %5 [i8* bitcast (i8** @_ZTIi to i8*)]
|
|
|
|
%7 = call i8* @llvm.wasm.get.exception(token %6)
|
|
|
|
%8 = call i32 @llvm.wasm.get.ehselector(token %6)
|
|
|
|
%9 = call i32 @llvm.eh.typeid.for(i8* bitcast (i8** @_ZTIi to i8*))
|
|
|
|
%matches = icmp eq i32 %8, %9
|
|
|
|
br i1 %matches, label %catch4, label %rethrow
|
|
|
|
; CHECK: catch.start3:
|
Reland "[WebAssembly] LSDA info generation"
Summary:
This adds support for LSDA (exception table) generation for wasm EH.
Wasm EH mostly follows the structure of Itanium-style exception tables,
with one exception: a call site table entry in wasm EH corresponds to
not a call site but a landing pad.
In wasm EH, the VM is responsible for stack unwinding. After an
exception occurs and the stack is unwound, the control flow is
transferred to wasm 'catch' instruction by the VM, after which the
personality function is called from the compiler-generated code. (Refer
to WasmEHPrepare pass for more information on this part.)
This patch:
- Changes wasm.landingpad.index intrinsic to take a token argument, to
make this 1:1 match with a catchpad instruction
- Stores landingpad index info and catch type info MachineFunction in
before instruction selection
- Lowers wasm.lsda intrinsic to an MCSymbol pointing to the start of an
exception table
- Adds WasmException class with overridden methods for table generation
- Adds support for LSDA section in Wasm object writer
Reviewers: dschuff, sbc100, rnk
Subscribers: mgorny, jgravelle-google, sunfish, llvm-commits
Differential Revision: https://reviews.llvm.org/D52748
llvm-svn: 345345
2018-10-26 07:55:10 +08:00
|
|
|
; CHECK: call void @llvm.wasm.landingpad.index(token %{{.+}}, i32 0)
|
2018-06-01 06:02:34 +08:00
|
|
|
|
|
|
|
catch4: ; preds = %catch.start3
|
|
|
|
%10 = call i8* @__cxa_begin_catch(i8* %7) [ "funclet"(token %6) ]
|
|
|
|
call void @__cxa_end_catch() [ "funclet"(token %6) ]
|
|
|
|
catchret from %6 to label %try.cont7
|
|
|
|
|
|
|
|
rethrow: ; preds = %catch.start3
|
[WebAssembly] Make rethrow take an except_ref type argument
Summary:
In the new wasm EH proposal, `rethrow` takes an `except_ref` argument.
This change was missing in r352598.
This patch adds `llvm.wasm.rethrow.in.catch` intrinsic. This is an
intrinsic that's gonna eventually be lowered to wasm `rethrow`
instruction, but this intrinsic can appear only within a catchpad or a
cleanuppad scope. Also this intrinsic needs to be invokable - otherwise
EH pad successor for it will not be correctly generated in clang.
This also adds lowering logic for this intrinsic in
`SelectionDAGBuilder::visitInvoke`. This routine is basically a
specialized and simplified version of
`SelectionDAGBuilder::visitTargetIntrinsic`, but we can't use it
because if is only for `CallInst`s.
This deletes the previous `llvm.wasm.rethrow` intrinsic and related
tests, which was meant to be used within a `__cxa_rethrow` library
function. Turned out this needs some more logic, so the intrinsic for
this purpose will be added later.
LateEHPrepare takes a result value of `catch` and inserts it into
matching `rethrow` as an argument.
`RETHROW_IN_CATCH` is a pseudo instruction that serves as a link between
`llvm.wasm.rethrow.in.catch` and the real wasm `rethrow` instruction. To
generate a `rethrow` instruction, we need an `except_ref` argument,
which is generated from `catch` instruction. But `catch` instrutions are
added in LateEHPrepare pass, so we use `RETHROW_IN_CATCH`, which takes
no argument, until we are able to correctly lower it to `rethrow` in
LateEHPrepare.
Reviewers: dschuff
Subscribers: sbc100, jgravelle-google, sunfish, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D59352
llvm-svn: 356316
2019-03-16 13:38:57 +08:00
|
|
|
call void @llvm.wasm.rethrow.in.catch() [ "funclet"(token %6) ]
|
2018-06-01 06:02:34 +08:00
|
|
|
unreachable
|
|
|
|
|
|
|
|
try.cont7: ; preds = %try.cont, %catch4
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
|
2019-02-26 11:29:59 +08:00
|
|
|
; A nested try-catch within a catch.
|
|
|
|
;
|
|
|
|
; void foo();
|
|
|
|
; void test2() {
|
|
|
|
; try {
|
|
|
|
; foo();
|
|
|
|
; } catch (int) {
|
|
|
|
; try {
|
|
|
|
; foo();
|
|
|
|
; } catch (int) {
|
|
|
|
; }
|
|
|
|
; }
|
|
|
|
; }
|
|
|
|
; Within the nested catchpad, wasm.lsda() call should NOT be generated.
|
2018-06-01 06:02:34 +08:00
|
|
|
define void @test2() personality i8* bitcast (i32 (...)* @__gxx_wasm_personality_v0 to i8*) {
|
|
|
|
; CHECK-LABEL: @test2()
|
|
|
|
entry:
|
|
|
|
invoke void @foo()
|
|
|
|
to label %try.cont9 unwind label %catch.dispatch
|
|
|
|
|
|
|
|
catch.dispatch: ; preds = %entry
|
|
|
|
%0 = catchswitch within none [label %catch.start] unwind to caller
|
|
|
|
|
|
|
|
catch.start: ; preds = %catch.dispatch
|
|
|
|
%1 = catchpad within %0 [i8* bitcast (i8** @_ZTIi to i8*)]
|
|
|
|
%2 = call i8* @llvm.wasm.get.exception(token %1)
|
|
|
|
%3 = call i32 @llvm.wasm.get.ehselector(token %1)
|
|
|
|
%4 = call i32 @llvm.eh.typeid.for(i8* bitcast (i8** @_ZTIi to i8*))
|
|
|
|
%matches = icmp eq i32 %3, %4
|
|
|
|
br i1 %matches, label %catch, label %rethrow
|
|
|
|
; CHECK: catch.start:
|
|
|
|
; CHECK: call i8* @llvm.wasm.lsda()
|
|
|
|
|
|
|
|
catch: ; preds = %catch.start
|
|
|
|
%5 = call i8* @__cxa_begin_catch(i8* %2) [ "funclet"(token %1) ]
|
|
|
|
invoke void @foo() [ "funclet"(token %1) ]
|
|
|
|
to label %try.cont unwind label %catch.dispatch2
|
|
|
|
|
|
|
|
catch.dispatch2: ; preds = %catch
|
|
|
|
%6 = catchswitch within %1 [label %catch.start3] unwind label %ehcleanup
|
|
|
|
|
|
|
|
catch.start3: ; preds = %catch.dispatch2
|
|
|
|
%7 = catchpad within %6 [i8* bitcast (i8** @_ZTIi to i8*)]
|
|
|
|
%8 = call i8* @llvm.wasm.get.exception(token %7)
|
|
|
|
%9 = call i32 @llvm.wasm.get.ehselector(token %7)
|
|
|
|
%10 = call i32 @llvm.eh.typeid.for(i8* bitcast (i8** @_ZTIi to i8*))
|
|
|
|
%matches4 = icmp eq i32 %9, %10
|
|
|
|
br i1 %matches4, label %catch6, label %rethrow5
|
|
|
|
; CHECK: catch.start3:
|
|
|
|
; CHECK-NOT: call i8* @llvm.wasm.lsda()
|
|
|
|
|
|
|
|
catch6: ; preds = %catch.start3
|
|
|
|
%11 = call i8* @__cxa_begin_catch(i8* %8) [ "funclet"(token %7) ]
|
|
|
|
call void @__cxa_end_catch() [ "funclet"(token %7) ]
|
|
|
|
catchret from %7 to label %try.cont
|
|
|
|
|
|
|
|
rethrow5: ; preds = %catch.start3
|
[WebAssembly] Make rethrow take an except_ref type argument
Summary:
In the new wasm EH proposal, `rethrow` takes an `except_ref` argument.
This change was missing in r352598.
This patch adds `llvm.wasm.rethrow.in.catch` intrinsic. This is an
intrinsic that's gonna eventually be lowered to wasm `rethrow`
instruction, but this intrinsic can appear only within a catchpad or a
cleanuppad scope. Also this intrinsic needs to be invokable - otherwise
EH pad successor for it will not be correctly generated in clang.
This also adds lowering logic for this intrinsic in
`SelectionDAGBuilder::visitInvoke`. This routine is basically a
specialized and simplified version of
`SelectionDAGBuilder::visitTargetIntrinsic`, but we can't use it
because if is only for `CallInst`s.
This deletes the previous `llvm.wasm.rethrow` intrinsic and related
tests, which was meant to be used within a `__cxa_rethrow` library
function. Turned out this needs some more logic, so the intrinsic for
this purpose will be added later.
LateEHPrepare takes a result value of `catch` and inserts it into
matching `rethrow` as an argument.
`RETHROW_IN_CATCH` is a pseudo instruction that serves as a link between
`llvm.wasm.rethrow.in.catch` and the real wasm `rethrow` instruction. To
generate a `rethrow` instruction, we need an `except_ref` argument,
which is generated from `catch` instruction. But `catch` instrutions are
added in LateEHPrepare pass, so we use `RETHROW_IN_CATCH`, which takes
no argument, until we are able to correctly lower it to `rethrow` in
LateEHPrepare.
Reviewers: dschuff
Subscribers: sbc100, jgravelle-google, sunfish, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D59352
llvm-svn: 356316
2019-03-16 13:38:57 +08:00
|
|
|
invoke void @llvm.wasm.rethrow.in.catch() [ "funclet"(token %7) ]
|
2018-06-01 06:02:34 +08:00
|
|
|
to label %unreachable unwind label %ehcleanup
|
|
|
|
|
|
|
|
try.cont: ; preds = %catch, %catch6
|
|
|
|
call void @__cxa_end_catch() [ "funclet"(token %1) ]
|
|
|
|
catchret from %1 to label %try.cont9
|
|
|
|
|
|
|
|
rethrow: ; preds = %catch.start
|
[WebAssembly] Make rethrow take an except_ref type argument
Summary:
In the new wasm EH proposal, `rethrow` takes an `except_ref` argument.
This change was missing in r352598.
This patch adds `llvm.wasm.rethrow.in.catch` intrinsic. This is an
intrinsic that's gonna eventually be lowered to wasm `rethrow`
instruction, but this intrinsic can appear only within a catchpad or a
cleanuppad scope. Also this intrinsic needs to be invokable - otherwise
EH pad successor for it will not be correctly generated in clang.
This also adds lowering logic for this intrinsic in
`SelectionDAGBuilder::visitInvoke`. This routine is basically a
specialized and simplified version of
`SelectionDAGBuilder::visitTargetIntrinsic`, but we can't use it
because if is only for `CallInst`s.
This deletes the previous `llvm.wasm.rethrow` intrinsic and related
tests, which was meant to be used within a `__cxa_rethrow` library
function. Turned out this needs some more logic, so the intrinsic for
this purpose will be added later.
LateEHPrepare takes a result value of `catch` and inserts it into
matching `rethrow` as an argument.
`RETHROW_IN_CATCH` is a pseudo instruction that serves as a link between
`llvm.wasm.rethrow.in.catch` and the real wasm `rethrow` instruction. To
generate a `rethrow` instruction, we need an `except_ref` argument,
which is generated from `catch` instruction. But `catch` instrutions are
added in LateEHPrepare pass, so we use `RETHROW_IN_CATCH`, which takes
no argument, until we are able to correctly lower it to `rethrow` in
LateEHPrepare.
Reviewers: dschuff
Subscribers: sbc100, jgravelle-google, sunfish, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D59352
llvm-svn: 356316
2019-03-16 13:38:57 +08:00
|
|
|
call void @llvm.wasm.rethrow.in.catch() [ "funclet"(token %1) ]
|
2018-06-01 06:02:34 +08:00
|
|
|
unreachable
|
|
|
|
|
|
|
|
try.cont9: ; preds = %entry, %try.cont
|
|
|
|
ret void
|
|
|
|
|
|
|
|
ehcleanup: ; preds = %rethrow5, %catch.dispatch2
|
|
|
|
%12 = cleanuppad within %1 []
|
|
|
|
call void @__cxa_end_catch() [ "funclet"(token %12) ]
|
|
|
|
cleanupret from %12 unwind to caller
|
|
|
|
; CHECK: ehcleanup:
|
|
|
|
; CHECK-NEXT: cleanuppad
|
|
|
|
; CHECK-NOT: call void @llvm.wasm.landingpad.index
|
|
|
|
; CHECK-NOT: store {{.*}} @__wasm_lpad_context
|
|
|
|
; CHECK-NOT: call i8* @llvm.wasm.lsda()
|
|
|
|
; CHECK-NOT: call i32 @_Unwind_CallPersonality
|
|
|
|
; CHECK-NOT: load {{.*}} @__wasm_lpad_context
|
|
|
|
|
|
|
|
unreachable: ; preds = %rethrow5
|
|
|
|
unreachable
|
|
|
|
}
|
|
|
|
|
|
|
|
; A cleanuppad with a call to __clang_call_terminate().
|
|
|
|
; A call to wasm.catch() should be generated after the cleanuppad.
|
2019-02-26 11:29:59 +08:00
|
|
|
;
|
|
|
|
; void foo();
|
|
|
|
; void test3() {
|
|
|
|
; try {
|
|
|
|
; foo();
|
|
|
|
; } catch (...) {
|
|
|
|
; foo();
|
|
|
|
; }
|
|
|
|
; }
|
[WebAssembly] Exception handling: Switch to the new proposal
Summary:
This switches the EH implementation to the new proposal:
https://github.com/WebAssembly/exception-handling/blob/master/proposals/Exceptions.md
(The previous proposal was
https://github.com/WebAssembly/exception-handling/blob/master/proposals/old/Exceptions.md)
- Instruction changes
- Now we have one single `catch` instruction that returns a except_ref
value
- `throw` now can take variable number of operations
- `rethrow` does not have 'depth' argument anymore
- `br_on_exn` queries an except_ref to see if it matches the tag and
branches to the given label if true.
- `extract_exception` is a pseudo instruction that simulates popping
values from wasm stack. This is to make `br_on_exn`, a very special
instruction, work: `br_on_exn` puts values onto the stack only if it
is taken, and the # of values can vay depending on the tag.
- Now there's only one `catch` per `try`, this patch removes all special
handling for terminate pad with a call to `__clang_call_terminate`.
Before it was the only case there are two catch clauses (a normal
`catch` and `catch_all` per `try`).
- Make `rethrow` act as a terminator like `throw`. This splits BB after
`rethrow` in WasmEHPrepare, and deletes an unnecessary `unreachable`
after `rethrow` in LateEHPrepare.
- Now we stop at all catchpads (because we add wasm `catch` instruction
that catches all exceptions), this creates new
`findWasmUnwindDestinations` function in SelectionDAGBuilder.
- Now we use `br_on_exn` instrution to figure out if an except_ref
matches the current tag or not, LateEHPrepare generates this sequence
for catch pads:
```
catch
block i32
br_on_exn $__cpp_exception
end_block
extract_exception
```
- Branch analysis for `br_on_exn` in WebAssemblyInstrInfo
- Other various misc. changes to switch to the new proposal.
Reviewers: dschuff
Subscribers: sbc100, jgravelle-google, sunfish, llvm-commits
Differential Revision: https://reviews.llvm.org/D57134
llvm-svn: 352598
2019-01-30 11:21:57 +08:00
|
|
|
define void @test3() personality i8* bitcast (i32 (...)* @__gxx_wasm_personality_v0 to i8*) {
|
2018-06-01 06:02:34 +08:00
|
|
|
; CHECK-LABEL: @test3
|
|
|
|
entry:
|
|
|
|
invoke void @foo()
|
|
|
|
to label %try.cont unwind label %catch.dispatch
|
|
|
|
|
|
|
|
catch.dispatch: ; preds = %entry
|
|
|
|
%0 = catchswitch within none [label %catch.start] unwind to caller
|
|
|
|
|
|
|
|
catch.start: ; preds = %catch.dispatch
|
|
|
|
%1 = catchpad within %0 [i8* null]
|
|
|
|
%2 = call i8* @llvm.wasm.get.exception(token %1)
|
|
|
|
%3 = call i32 @llvm.wasm.get.ehselector(token %1)
|
|
|
|
%4 = call i8* @__cxa_begin_catch(i8* %2) [ "funclet"(token %1) ]
|
|
|
|
invoke void @foo() [ "funclet"(token %1) ]
|
|
|
|
to label %invoke.cont1 unwind label %ehcleanup
|
|
|
|
|
|
|
|
invoke.cont1: ; preds = %catch.start
|
|
|
|
call void @__cxa_end_catch() [ "funclet"(token %1) ]
|
|
|
|
catchret from %1 to label %try.cont
|
|
|
|
|
|
|
|
try.cont: ; preds = %entry, %invoke.cont1
|
|
|
|
ret void
|
|
|
|
|
|
|
|
ehcleanup: ; preds = %catch.start
|
|
|
|
%5 = cleanuppad within %1 []
|
|
|
|
invoke void @__cxa_end_catch() [ "funclet"(token %5) ]
|
|
|
|
to label %invoke.cont2 unwind label %terminate
|
|
|
|
|
|
|
|
invoke.cont2: ; preds = %ehcleanup
|
|
|
|
cleanupret from %5 unwind to caller
|
|
|
|
|
|
|
|
terminate: ; preds = %ehcleanup
|
|
|
|
%6 = cleanuppad within %5 []
|
|
|
|
%7 = call i8* @llvm.wasm.get.exception(token %6)
|
|
|
|
call void @__clang_call_terminate(i8* %7) [ "funclet"(token %6) ]
|
|
|
|
unreachable
|
|
|
|
; CHECK: terminate:
|
|
|
|
; CHECK-NEXT: cleanuppad
|
[WebAssembly] Exception handling: Switch to the new proposal
Summary:
This switches the EH implementation to the new proposal:
https://github.com/WebAssembly/exception-handling/blob/master/proposals/Exceptions.md
(The previous proposal was
https://github.com/WebAssembly/exception-handling/blob/master/proposals/old/Exceptions.md)
- Instruction changes
- Now we have one single `catch` instruction that returns a except_ref
value
- `throw` now can take variable number of operations
- `rethrow` does not have 'depth' argument anymore
- `br_on_exn` queries an except_ref to see if it matches the tag and
branches to the given label if true.
- `extract_exception` is a pseudo instruction that simulates popping
values from wasm stack. This is to make `br_on_exn`, a very special
instruction, work: `br_on_exn` puts values onto the stack only if it
is taken, and the # of values can vay depending on the tag.
- Now there's only one `catch` per `try`, this patch removes all special
handling for terminate pad with a call to `__clang_call_terminate`.
Before it was the only case there are two catch clauses (a normal
`catch` and `catch_all` per `try`).
- Make `rethrow` act as a terminator like `throw`. This splits BB after
`rethrow` in WasmEHPrepare, and deletes an unnecessary `unreachable`
after `rethrow` in LateEHPrepare.
- Now we stop at all catchpads (because we add wasm `catch` instruction
that catches all exceptions), this creates new
`findWasmUnwindDestinations` function in SelectionDAGBuilder.
- Now we use `br_on_exn` instrution to figure out if an except_ref
matches the current tag or not, LateEHPrepare generates this sequence
for catch pads:
```
catch
block i32
br_on_exn $__cpp_exception
end_block
extract_exception
```
- Branch analysis for `br_on_exn` in WebAssemblyInstrInfo
- Other various misc. changes to switch to the new proposal.
Reviewers: dschuff
Subscribers: sbc100, jgravelle-google, sunfish, llvm-commits
Differential Revision: https://reviews.llvm.org/D57134
llvm-svn: 352598
2019-01-30 11:21:57 +08:00
|
|
|
; CHECK-NEXT: %[[EXN:.*]] = call i8* @llvm.wasm.extract.exception
|
2018-06-01 06:02:34 +08:00
|
|
|
; CHECK-NEXT: call void @__clang_call_terminate(i8* %[[EXN]])
|
|
|
|
}
|
|
|
|
|
|
|
|
; PHI demotion test. Only the phi before catchswitch should be demoted; the phi
|
|
|
|
; before cleanuppad should NOT.
|
2019-02-26 11:29:59 +08:00
|
|
|
;
|
|
|
|
; void foo();
|
|
|
|
; int bar(int) noexcept;
|
|
|
|
; struct Temp {
|
|
|
|
; ~Temp() {}
|
|
|
|
; };
|
|
|
|
;
|
|
|
|
; void test4() {
|
|
|
|
; int num;
|
|
|
|
; try {
|
|
|
|
; Temp t;
|
|
|
|
; num = 1;
|
|
|
|
; foo();
|
|
|
|
; num = 2;
|
|
|
|
; foo();
|
|
|
|
; } catch (...) {
|
|
|
|
; bar(num);
|
|
|
|
; }
|
|
|
|
; try {
|
|
|
|
; foo();
|
|
|
|
; num = 1;
|
|
|
|
; foo();
|
|
|
|
; num = 2;
|
|
|
|
; } catch (...) {
|
|
|
|
; bar(num);
|
|
|
|
; }
|
|
|
|
; }
|
[WebAssembly] Exception handling: Switch to the new proposal
Summary:
This switches the EH implementation to the new proposal:
https://github.com/WebAssembly/exception-handling/blob/master/proposals/Exceptions.md
(The previous proposal was
https://github.com/WebAssembly/exception-handling/blob/master/proposals/old/Exceptions.md)
- Instruction changes
- Now we have one single `catch` instruction that returns a except_ref
value
- `throw` now can take variable number of operations
- `rethrow` does not have 'depth' argument anymore
- `br_on_exn` queries an except_ref to see if it matches the tag and
branches to the given label if true.
- `extract_exception` is a pseudo instruction that simulates popping
values from wasm stack. This is to make `br_on_exn`, a very special
instruction, work: `br_on_exn` puts values onto the stack only if it
is taken, and the # of values can vay depending on the tag.
- Now there's only one `catch` per `try`, this patch removes all special
handling for terminate pad with a call to `__clang_call_terminate`.
Before it was the only case there are two catch clauses (a normal
`catch` and `catch_all` per `try`).
- Make `rethrow` act as a terminator like `throw`. This splits BB after
`rethrow` in WasmEHPrepare, and deletes an unnecessary `unreachable`
after `rethrow` in LateEHPrepare.
- Now we stop at all catchpads (because we add wasm `catch` instruction
that catches all exceptions), this creates new
`findWasmUnwindDestinations` function in SelectionDAGBuilder.
- Now we use `br_on_exn` instrution to figure out if an except_ref
matches the current tag or not, LateEHPrepare generates this sequence
for catch pads:
```
catch
block i32
br_on_exn $__cpp_exception
end_block
extract_exception
```
- Branch analysis for `br_on_exn` in WebAssemblyInstrInfo
- Other various misc. changes to switch to the new proposal.
Reviewers: dschuff
Subscribers: sbc100, jgravelle-google, sunfish, llvm-commits
Differential Revision: https://reviews.llvm.org/D57134
llvm-svn: 352598
2019-01-30 11:21:57 +08:00
|
|
|
define void @test4() personality i8* bitcast (i32 (...)* @__gxx_wasm_personality_v0 to i8*) {
|
|
|
|
; CHECK-LABEL: @test4
|
2018-06-01 06:02:34 +08:00
|
|
|
entry:
|
2019-02-26 11:29:59 +08:00
|
|
|
%t = alloca %struct.Temp, align 1
|
2018-06-01 06:02:34 +08:00
|
|
|
invoke void @foo()
|
|
|
|
to label %invoke.cont unwind label %ehcleanup
|
|
|
|
|
|
|
|
invoke.cont: ; preds = %entry
|
|
|
|
invoke void @foo()
|
|
|
|
to label %invoke.cont1 unwind label %ehcleanup
|
|
|
|
|
|
|
|
invoke.cont1: ; preds = %invoke.cont
|
2019-02-26 11:29:59 +08:00
|
|
|
%call = call %struct.Temp* @_ZN4TempD2Ev(%struct.Temp* %t)
|
2018-06-01 06:02:34 +08:00
|
|
|
br label %try.cont
|
|
|
|
|
|
|
|
ehcleanup: ; preds = %invoke.cont, %entry
|
|
|
|
%num.0 = phi i32 [ 2, %invoke.cont ], [ 1, %entry ]
|
|
|
|
%0 = cleanuppad within none []
|
2019-02-26 11:29:59 +08:00
|
|
|
%call2 = call %struct.Temp* @_ZN4TempD2Ev(%struct.Temp* %t) [ "funclet"(token %0) ]
|
2018-06-01 06:02:34 +08:00
|
|
|
cleanupret from %0 unwind label %catch.dispatch
|
|
|
|
; CHECK: ehcleanup:
|
|
|
|
; CHECK-NEXT: = phi
|
|
|
|
|
|
|
|
catch.dispatch: ; preds = %ehcleanup
|
|
|
|
%1 = catchswitch within none [label %catch.start] unwind to caller
|
|
|
|
|
|
|
|
catch.start: ; preds = %catch.dispatch
|
|
|
|
%2 = catchpad within %1 [i8* null]
|
|
|
|
%3 = call i8* @llvm.wasm.get.exception(token %2)
|
|
|
|
%4 = call i32 @llvm.wasm.get.ehselector(token %2)
|
|
|
|
%5 = call i8* @__cxa_begin_catch(i8* %3) [ "funclet"(token %2) ]
|
2019-02-26 11:29:59 +08:00
|
|
|
call void @bar(i32 %num.0) [ "funclet"(token %2) ]
|
2018-06-01 06:02:34 +08:00
|
|
|
call void @__cxa_end_catch() [ "funclet"(token %2) ]
|
|
|
|
catchret from %2 to label %try.cont
|
|
|
|
|
|
|
|
try.cont: ; preds = %catch.start, %invoke.cont1
|
|
|
|
invoke void @foo()
|
|
|
|
to label %invoke.cont3 unwind label %catch.dispatch5
|
|
|
|
|
|
|
|
invoke.cont3: ; preds = %try.cont
|
|
|
|
invoke void @foo()
|
|
|
|
to label %try.cont10 unwind label %catch.dispatch5
|
|
|
|
|
|
|
|
catch.dispatch5: ; preds = %invoke.cont3, %try.cont
|
|
|
|
%num.1 = phi i32 [ 2, %invoke.cont3 ], [ 1, %try.cont ]
|
|
|
|
%6 = catchswitch within none [label %catch.start6] unwind to caller
|
|
|
|
; CHECK: catch.dispatch5:
|
|
|
|
; CHECK-NOT: = phi
|
|
|
|
|
|
|
|
catch.start6: ; preds = %catch.dispatch5
|
|
|
|
%7 = catchpad within %6 [i8* null]
|
|
|
|
%8 = call i8* @llvm.wasm.get.exception(token %7)
|
|
|
|
%9 = call i32 @llvm.wasm.get.ehselector(token %7)
|
|
|
|
%10 = call i8* @__cxa_begin_catch(i8* %8) [ "funclet"(token %7) ]
|
2019-02-26 11:29:59 +08:00
|
|
|
call void @bar(i32 %num.1) [ "funclet"(token %7) ]
|
2018-06-01 06:02:34 +08:00
|
|
|
call void @__cxa_end_catch() [ "funclet"(token %7) ]
|
|
|
|
catchret from %7 to label %try.cont10
|
|
|
|
|
|
|
|
try.cont10: ; preds = %invoke.cont3, %catch.start6
|
|
|
|
ret void
|
|
|
|
}
|
|
|
|
|
2018-11-16 08:47:18 +08:00
|
|
|
; Tests if instructions after a call to @llvm.wasm.throw are deleted and the
|
|
|
|
; BB's dead children are deleted.
|
|
|
|
|
[WebAssembly] Exception handling: Switch to the new proposal
Summary:
This switches the EH implementation to the new proposal:
https://github.com/WebAssembly/exception-handling/blob/master/proposals/Exceptions.md
(The previous proposal was
https://github.com/WebAssembly/exception-handling/blob/master/proposals/old/Exceptions.md)
- Instruction changes
- Now we have one single `catch` instruction that returns a except_ref
value
- `throw` now can take variable number of operations
- `rethrow` does not have 'depth' argument anymore
- `br_on_exn` queries an except_ref to see if it matches the tag and
branches to the given label if true.
- `extract_exception` is a pseudo instruction that simulates popping
values from wasm stack. This is to make `br_on_exn`, a very special
instruction, work: `br_on_exn` puts values onto the stack only if it
is taken, and the # of values can vay depending on the tag.
- Now there's only one `catch` per `try`, this patch removes all special
handling for terminate pad with a call to `__clang_call_terminate`.
Before it was the only case there are two catch clauses (a normal
`catch` and `catch_all` per `try`).
- Make `rethrow` act as a terminator like `throw`. This splits BB after
`rethrow` in WasmEHPrepare, and deletes an unnecessary `unreachable`
after `rethrow` in LateEHPrepare.
- Now we stop at all catchpads (because we add wasm `catch` instruction
that catches all exceptions), this creates new
`findWasmUnwindDestinations` function in SelectionDAGBuilder.
- Now we use `br_on_exn` instrution to figure out if an except_ref
matches the current tag or not, LateEHPrepare generates this sequence
for catch pads:
```
catch
block i32
br_on_exn $__cpp_exception
end_block
extract_exception
```
- Branch analysis for `br_on_exn` in WebAssemblyInstrInfo
- Other various misc. changes to switch to the new proposal.
Reviewers: dschuff
Subscribers: sbc100, jgravelle-google, sunfish, llvm-commits
Differential Revision: https://reviews.llvm.org/D57134
llvm-svn: 352598
2019-01-30 11:21:57 +08:00
|
|
|
; CHECK-LABEL: @test5
|
|
|
|
define i32 @test5(i1 %b, i8* %p) {
|
2018-11-16 08:47:18 +08:00
|
|
|
entry:
|
|
|
|
br i1 %b, label %bb.true, label %bb.false
|
|
|
|
|
|
|
|
; CHECK: bb.true:
|
|
|
|
; CHECK-NEXT: call void @llvm.wasm.throw(i32 0, i8* %p)
|
|
|
|
; CHECK-NEXT: unreachable
|
|
|
|
bb.true: ; preds = %entry
|
|
|
|
call void @llvm.wasm.throw(i32 0, i8* %p)
|
|
|
|
br label %bb.true.0
|
|
|
|
|
|
|
|
; CHECK-NOT: bb.true.0
|
|
|
|
bb.true.0: ; preds = %bb.true
|
|
|
|
br label %merge
|
|
|
|
|
|
|
|
; CHECK: bb.false
|
|
|
|
bb.false: ; preds = %entry
|
|
|
|
br label %merge
|
|
|
|
|
|
|
|
; CHECK: merge
|
|
|
|
merge: ; preds = %bb.true.0, %bb.false
|
|
|
|
ret i32 0
|
|
|
|
}
|
|
|
|
|
2018-06-01 06:02:34 +08:00
|
|
|
declare void @foo()
|
2019-02-26 11:29:59 +08:00
|
|
|
declare void @bar(i32)
|
|
|
|
declare %struct.Temp* @_ZN4TempD2Ev(%struct.Temp* returned)
|
2018-06-01 06:02:34 +08:00
|
|
|
declare i32 @__gxx_wasm_personality_v0(...)
|
|
|
|
declare i8* @llvm.wasm.get.exception(token)
|
|
|
|
declare i32 @llvm.wasm.get.ehselector(token)
|
|
|
|
declare i32 @llvm.eh.typeid.for(i8*)
|
2018-11-16 08:47:18 +08:00
|
|
|
declare void @llvm.wasm.throw(i32, i8*)
|
[WebAssembly] Make rethrow take an except_ref type argument
Summary:
In the new wasm EH proposal, `rethrow` takes an `except_ref` argument.
This change was missing in r352598.
This patch adds `llvm.wasm.rethrow.in.catch` intrinsic. This is an
intrinsic that's gonna eventually be lowered to wasm `rethrow`
instruction, but this intrinsic can appear only within a catchpad or a
cleanuppad scope. Also this intrinsic needs to be invokable - otherwise
EH pad successor for it will not be correctly generated in clang.
This also adds lowering logic for this intrinsic in
`SelectionDAGBuilder::visitInvoke`. This routine is basically a
specialized and simplified version of
`SelectionDAGBuilder::visitTargetIntrinsic`, but we can't use it
because if is only for `CallInst`s.
This deletes the previous `llvm.wasm.rethrow` intrinsic and related
tests, which was meant to be used within a `__cxa_rethrow` library
function. Turned out this needs some more logic, so the intrinsic for
this purpose will be added later.
LateEHPrepare takes a result value of `catch` and inserts it into
matching `rethrow` as an argument.
`RETHROW_IN_CATCH` is a pseudo instruction that serves as a link between
`llvm.wasm.rethrow.in.catch` and the real wasm `rethrow` instruction. To
generate a `rethrow` instruction, we need an `except_ref` argument,
which is generated from `catch` instruction. But `catch` instrutions are
added in LateEHPrepare pass, so we use `RETHROW_IN_CATCH`, which takes
no argument, until we are able to correctly lower it to `rethrow` in
LateEHPrepare.
Reviewers: dschuff
Subscribers: sbc100, jgravelle-google, sunfish, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D59352
llvm-svn: 356316
2019-03-16 13:38:57 +08:00
|
|
|
declare void @llvm.wasm.rethrow.in.catch()
|
2018-06-01 06:02:34 +08:00
|
|
|
declare i8* @__cxa_begin_catch(i8*)
|
|
|
|
declare void @__cxa_end_catch()
|
|
|
|
declare void @__clang_call_terminate(i8*)
|
|
|
|
|
2019-03-19 13:02:30 +08:00
|
|
|
; CHECK-DAG: declare void @llvm.wasm.landingpad.index(token, i32 immarg)
|
2018-06-01 06:02:34 +08:00
|
|
|
; CHECK-DAG: declare i8* @llvm.wasm.lsda()
|
|
|
|
; CHECK-DAG: declare i32 @_Unwind_CallPersonality(i8*)
|