diff options
| author | Thomas Lively <tlively@google.com> | 2024-08-06 13:22:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-06 10:22:38 -0700 |
| commit | bae0da03af8f4f240d659d016b6e4ee998551059 (patch) | |
| tree | 02ea1286345871e9f4223bc817804e5515c625c7 /src/wasm-type.h | |
| parent | 6fe3d885604bb053979f4e5adad2840ea936fd17 (diff) | |
| download | binaryen-bae0da03af8f4f240d659d016b6e4ee998551059.tar.gz binaryen-bae0da03af8f4f240d659d016b6e4ee998551059.tar.bz2 binaryen-bae0da03af8f4f240d659d016b6e4ee998551059.zip | |
[NFC] Add HeapType::getKind returning a new HeapTypeKind enum (#6804)
The HeapType API has functions like `isBasic()`, `isStruct()`,
`isSignature()`, etc. to test the classification of a heap type. Many
users have to call these functions in sequence and handle all or most of
the possible classifications. When we add a new kind of heap type,
finding and updating all these sites is a manual and error-prone
process.
To make adding new heap type kinds easier, introduce a new API that
returns an enum classifying the heap type. The enum can be used in
switch statements and the compiler's exhaustiveness checker will flag
use sites that need to be updated when we add a new kind of heap type.
This commit uses the new enum internally in the type system, but
follow-on commits will add new uses and convert uses of the existing
APIs to use `getKind` instead.
Diffstat (limited to 'src/wasm-type.h')
| -rw-r--r-- | src/wasm-type.h | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/src/wasm-type.h b/src/wasm-type.h index 49179b1a6..58655edc7 100644 --- a/src/wasm-type.h +++ b/src/wasm-type.h @@ -170,7 +170,6 @@ public: bool isSignature() const; bool isStruct() const; bool isArray() const; - bool isString() const; bool isDefaultable() const; Nullability getNullability() const; @@ -311,6 +310,14 @@ public: enum Shareability { Shared, Unshared }; +enum class HeapTypeKind { + Basic, + Func, + Struct, + Array, + Cont, +}; + class HeapType { // Unlike `Type`, which represents the types of values on the WebAssembly // stack, `HeapType` is used to describe the structures that reference types @@ -365,18 +372,21 @@ public: HeapType(Struct&& struct_); HeapType(Array array); + HeapTypeKind getKind() const; + constexpr bool isBasic() const { return id <= _last_basic_type; } - bool isFunction() const; - bool isData() const; - bool isSignature() const; - // Indicates whether the given type was defined to be of the form - // `(cont $ft)`. Returns false for `cont`, the top type of the continuation - // type hierarchy (and all other types). In other words, this is analogous to - // `isSignature`, but for continuation types. - bool isContinuation() const; - bool isStruct() const; - bool isArray() const; - bool isString() const; + bool isFunction() const { + return isMaybeShared(func) || getKind() == HeapTypeKind::Func; + } + bool isData() const { + auto kind = getKind(); + return isMaybeShared(string) || kind == HeapTypeKind::Struct || + kind == HeapTypeKind::Array; + } + bool isSignature() const { return getKind() == HeapTypeKind::Func; } + bool isContinuation() const { return getKind() == HeapTypeKind::Cont; } + bool isStruct() const { return getKind() == HeapTypeKind::Struct; } + bool isArray() const { return getKind() == HeapTypeKind::Array; } bool isBottom() const; bool isOpen() const; bool isShared() const { return getShared() == Shared; } @@ -385,7 +395,7 @@ public: // Check if the type is a given basic heap type, while ignoring whether it is // shared or not. - bool isMaybeShared(BasicHeapType type) { + bool isMaybeShared(BasicHeapType type) const { return isBasic() && getBasic(Unshared) == type; } |