diff options
| author | Alon Zakai <azakai@google.com> | 2021-09-20 10:47:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 17:47:14 +0000 |
| commit | 737c22d30798c491eea3b401b948b9327ac979de (patch) | |
| tree | f75a72adbd81a85eca19b732378837670c828b23 /src/wasm/wasm-binary.cpp | |
| parent | b5e8c371001de20128453d5064ac0422d481020e (diff) | |
| download | binaryen-737c22d30798c491eea3b401b948b9327ac979de.tar.gz binaryen-737c22d30798c491eea3b401b948b9327ac979de.tar.bz2 binaryen-737c22d30798c491eea3b401b948b9327ac979de.zip | |
[Wasm GC] Add static variants of ref.test, ref.cast, and br_on_cast* (#4163)
These variants take a HeapType that is the type we intend to cast to,
and do not take an RTT.
These are intended to be more statically optimizable. For now though
this PR just implements the minimum to get them parsing and to get
through the optimizer without crashing.
Spec: https://docs.google.com/document/d/1afthjsL_B9UaMqCA5ekgVmOm75BVFu6duHNsN9-gnXw/edit#
See #4149
Diffstat (limited to 'src/wasm/wasm-binary.cpp')
| -rw-r--r-- | src/wasm/wasm-binary.cpp | 43 |
1 files changed, 31 insertions, 12 deletions
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp index dad6f9320..e1ff43988 100644 --- a/src/wasm/wasm-binary.cpp +++ b/src/wasm/wasm-binary.cpp @@ -6419,23 +6419,33 @@ bool WasmBinaryBuilder::maybeVisitI31Get(Expression*& out, uint32_t code) { } bool WasmBinaryBuilder::maybeVisitRefTest(Expression*& out, uint32_t code) { - if (code != BinaryConsts::RefTest) { - return false; + if (code == BinaryConsts::RefTest) { + auto* rtt = popNonVoidExpression(); + auto* ref = popNonVoidExpression(); + out = Builder(wasm).makeRefTest(ref, rtt); + return true; + } else if (code == BinaryConsts::RefTestStatic) { + auto intendedType = getIndexedHeapType(); + auto* ref = popNonVoidExpression(); + out = Builder(wasm).makeRefTest(ref, intendedType); + return true; } - auto* rtt = popNonVoidExpression(); - auto* ref = popNonVoidExpression(); - out = Builder(wasm).makeRefTest(ref, rtt); - return true; + return false; } bool WasmBinaryBuilder::maybeVisitRefCast(Expression*& out, uint32_t code) { - if (code != BinaryConsts::RefCast) { - return false; + if (code == BinaryConsts::RefCast) { + auto* rtt = popNonVoidExpression(); + auto* ref = popNonVoidExpression(); + out = Builder(wasm).makeRefCast(ref, rtt); + return true; + } else if (code == BinaryConsts::RefCastStatic) { + auto intendedType = getIndexedHeapType(); + auto* ref = popNonVoidExpression(); + out = Builder(wasm).makeRefCast(ref, intendedType); + return true; } - auto* rtt = popNonVoidExpression(); - auto* ref = popNonVoidExpression(); - out = Builder(wasm).makeRefCast(ref, rtt); - return true; + return false; } bool WasmBinaryBuilder::maybeVisitBrOn(Expression*& out, uint32_t code) { @@ -6448,9 +6458,11 @@ bool WasmBinaryBuilder::maybeVisitBrOn(Expression*& out, uint32_t code) { op = BrOnNonNull; break; case BinaryConsts::BrOnCast: + case BinaryConsts::BrOnCastStatic: op = BrOnCast; break; case BinaryConsts::BrOnCastFail: + case BinaryConsts::BrOnCastStaticFail: op = BrOnCastFail; break; case BinaryConsts::BrOnFunc: @@ -6475,6 +6487,13 @@ bool WasmBinaryBuilder::maybeVisitBrOn(Expression*& out, uint32_t code) { return false; } auto name = getBreakTarget(getU32LEB()).name; + if (code == BinaryConsts::BrOnCastStatic || + code == BinaryConsts::BrOnCastStaticFail) { + auto intendedType = getIndexedHeapType(); + auto* ref = popNonVoidExpression(); + out = Builder(wasm).makeBrOn(op, name, ref, intendedType); + return true; + } Expression* rtt = nullptr; if (op == BrOnCast || op == BrOnCastFail) { rtt = popNonVoidExpression(); |