OSDN Git Service

[WebAssembly] Make rethrow take an except_ref type argument
authorHeejin Ahn <aheejin@gmail.com>
Sat, 16 Mar 2019 05:38:57 +0000 (05:38 +0000)
committerHeejin Ahn <aheejin@gmail.com>
Sat, 16 Mar 2019 05:38:57 +0000 (05:38 +0000)
commit421f4e7b6ab3aa9f0d2f4872c4169de86a8fa167
treeb68b79359029fedb6b47a1dcacd4d7492189360a
parentc1447a19117481bd41b1ca27f7a1c511d000a532
[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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@356316 91177308-0d34-0410-b5e6-96231b3b80d8
include/llvm/IR/IntrinsicsWebAssembly.td
lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
lib/CodeGen/WasmEHPrepare.cpp
lib/IR/Verifier.cpp
lib/Target/WebAssembly/WebAssemblyInstrControl.td
lib/Target/WebAssembly/WebAssemblyLateEHPrepare.cpp
test/CodeGen/WebAssembly/cfg-stackify-eh.ll
test/CodeGen/WebAssembly/exception.ll
test/CodeGen/WebAssembly/wasmehprepare.ll