diff options
| author | Daniel Wirtz <dcode@dcode.io> | 2020-08-17 19:50:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 10:50:37 -0700 |
| commit | 0fdbb1d33810d84bbd9a408b3486bff0d9015989 (patch) | |
| tree | 54a0955fa5b4640ab0b7538a7c5ba96578de6b7d /src/wasm-interpreter.h | |
| parent | 5f992018bf0e80a430d9a0169c7f8048e0a98b2b (diff) | |
| download | binaryen-0fdbb1d33810d84bbd9a408b3486bff0d9015989.tar.gz binaryen-0fdbb1d33810d84bbd9a408b3486bff0d9015989.tar.bz2 binaryen-0fdbb1d33810d84bbd9a408b3486bff0d9015989.zip | |
Prepare for compound types that are single but not basic (#3046)
As a follow-up to https://github.com/WebAssembly/binaryen/pull/3012#pullrequestreview-459686171 this PR prepares for the new compound Signature, Struct and Array types that are single but not basic.
This includes:
* Renames `Type::getSingle` to `Type::getBasic` (NFC). Previously, its name was not representing its implementation (`isSingle` excluded `none` and `unreachable` while `getSingle` didn't, i.e. `getSingle` really was `getBasic`). Note that a hypothetical `Type::getSingle` cannot return `ValueType` anyway (new compound types are single but don't map to `ValueType`), so I figured it's best to skip implementing it until we actually need it.
* Marks locations where we are (still) assuming that all single types are basic types, as suggested in https://github.com/WebAssembly/binaryen/pull/3012#discussion_r465356708, but using a macro, so we get useful errors once we start implementing the new types and can quickly traverse the affected locations.
The macro is added where
* there used to be a `switch (type.getSingle())` or similar that handled any basic type (NFC), but in the future will also have to handle single types that are not basic types.
* we are not dealing with `Unary`, `Binary`, `Load`, `Store` or `AtomicXY` instructions, since these don't deal with compound types anyway.
Diffstat (limited to 'src/wasm-interpreter.h')
| -rw-r--r-- | src/wasm-interpreter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h index a61f549c7..4f0d22e58 100644 --- a/src/wasm-interpreter.h +++ b/src/wasm-interpreter.h @@ -1602,7 +1602,7 @@ public: // the default impls for load and store switch on the sizes. you can either // customize load/store, or the sub-functions which they call virtual Literal load(Load* load, Address addr) { - switch (load->type.getSingle()) { + switch (load->type.getBasic()) { case Type::i32: { switch (load->bytes) { case 1: @@ -1653,7 +1653,7 @@ public: WASM_UNREACHABLE("invalid type"); } virtual void store(Store* store, Address addr, Literal value) { - switch (store->valueType.getSingle()) { + switch (store->valueType.getBasic()) { case Type::i32: { switch (store->bytes) { case 1: |