diff options
| author | Thomas Lively <tlively@google.com> | 2024-06-18 18:20:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-19 01:20:49 +0000 |
| commit | 2df678e4670517eaac40d1d2d9541d3b706b324b (patch) | |
| tree | 3a47da6a20834dad1e43a8953ea428eb12fcb13c /src/wasm-type.h | |
| parent | 829e228d4b2ccb314ea1e653fd16154ae3fd31b3 (diff) | |
| download | binaryen-2df678e4670517eaac40d1d2d9541d3b706b324b.tar.gz binaryen-2df678e4670517eaac40d1d2d9541d3b706b324b.tar.bz2 binaryen-2df678e4670517eaac40d1d2d9541d3b706b324b.zip | |
[threads] Shared basic heap types (#6667)
Implement binary and text parsing and printing of shared basic heap types and
incorporate them into the type hierarchy.
To avoid the massive amount of code duplication that would be necessary if we
were to add separate enum variants for each of the shared basic heap types, use
bit 0 to indicate whether the type is shared and replace `getBasic()` with
`getBasic(Unshared)`, which clears that bit. Update all the use sites to record
whether the original type was shared and produce shared or unshared output
without code duplication.
Diffstat (limited to 'src/wasm-type.h')
| -rw-r--r-- | src/wasm-type.h | 64 |
1 files changed, 39 insertions, 25 deletions
diff --git a/src/wasm-type.h b/src/wasm-type.h index 2a74e4a60..95c3605a5 100644 --- a/src/wasm-type.h +++ b/src/wasm-type.h @@ -310,6 +310,8 @@ public: const Type& operator[](size_t i) const { return *Iterator{{this, i}}; } }; +enum Shareability { Shared, Unshared }; + class HeapType { // Unlike `Type`, which represents the types of values on the WebAssembly // stack, `HeapType` is used to describe the structures that reference types @@ -318,24 +320,26 @@ class HeapType { uintptr_t id; public: + // Bit zero indicates whether the type is `shared`, so we need to leave it + // free. enum BasicHeapType : uint32_t { - ext, - func, - cont, - any, - eq, - i31, - struct_, - array, - exn, - string, - none, - noext, - nofunc, - nocont, - noexn, + ext = 0 << 1, + func = 1 << 1, + cont = 2 << 1, + any = 3 << 1, + eq = 4 << 1, + i31 = 5 << 1, + struct_ = 6 << 1, + array = 7 << 1, + exn = 8 << 1, + string = 9 << 1, + none = 10 << 1, + noext = 11 << 1, + nofunc = 12 << 1, + nocont = 13 << 1, + noexn = 14 << 1, }; - static constexpr BasicHeapType _last_basic_type = noexn; + static constexpr BasicHeapType _last_basic_type = BasicHeapType(noexn + 1); // BasicHeapType can be implicitly upgraded to HeapType constexpr HeapType(BasicHeapType id) : id(id) {} @@ -377,7 +381,9 @@ public: bool isString() const; bool isBottom() const; bool isOpen() const; - bool isShared() const; + bool isShared() const { return getShared() == Shared; } + + Shareability getShared() const; Signature getSignature() const; Continuation getContinuation() const; @@ -399,19 +405,27 @@ public: size_t getDepth() const; // Get the bottom heap type for this heap type's hierarchy. - BasicHeapType getBottom() const; + BasicHeapType getUnsharedBottom() const; + BasicHeapType getBottom() const { + return HeapType(getUnsharedBottom()).getBasic(getShared()); + } // Get the top heap type for this heap type's hierarchy. - BasicHeapType getTop() const; + BasicHeapType getUnsharedTop() const; + BasicHeapType getTop() const { + return HeapType(getUnsharedTop()).getBasic(getShared()); + } // Get the recursion group for this non-basic type. RecGroup getRecGroup() const; size_t getRecGroupIndex() const; constexpr TypeID getID() const { return id; } - constexpr BasicHeapType getBasic() const { - assert(isBasic() && "Basic heap type expected"); - return static_cast<BasicHeapType>(id); + + // Get the shared or unshared version of this basic heap type. + constexpr BasicHeapType getBasic(Shareability share) const { + assert(isBasic()); + return BasicHeapType(share == Shared ? (id | 1) : (id & ~1)); } // (In)equality must be defined for both HeapType and BasicHeapType because it @@ -644,7 +658,7 @@ struct TypeBuilder { void createRecGroup(size_t i, size_t length); void setOpen(size_t i, bool open = true); - void setShared(size_t i, bool shared = true); + void setShared(size_t i, Shareability share = Shared); enum class ErrorReason { // There is a cycle in the supertype relation. @@ -717,8 +731,8 @@ struct TypeBuilder { builder.setOpen(index, open); return *this; } - Entry& setShared(bool shared = true) { - builder.setShared(index, shared); + Entry& setShared(Shareability share = Shared) { + builder.setShared(index, share); return *this; } }; |