Convert TrapCode to a single byte
#9338
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
cranelift
fitzgen
approved these changes
Oct 1, 2024
Comment on lines
369
to
+376
| // This is the default trap code, so don't print anything extra | ||
| // for this. | ||
| Some(TrapCode::HeapOutOfBounds) => {} | ||
| Some(TrapCode::HEAP_OUT_OF_BOUNDS) => {} |
There was a problem hiding this comment.
Unrelated to this PR, but it seems like we should print heap oob traps, since it is possible to not have any traps...
There was a problem hiding this comment.
Lack of trap though prints as notrap, so I think we're good?
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
This commit refactors the representation of `cranelift_codegen::ir::TrapCode` to be a single byte. The previous enumeration is replaced with an opaque byte-sized structure. Previous variants that Cranelift uses internally are now associated `const` values on `TrapCode` itself. For example `TrapCode::IntegerOverflow` is now `TrapCode::INTEGER_OVERFLOW`. All non-Cranelift traps are now removed and exclusively live in the `wasmtime-cranelift` crate now. The representation of a `TrapCode` is now: * 0 - invalid, used in `MemFlags` for "no trap code" * 1..256-N - user traps * 256-N..256 - built-in Cranelift traps (it uses N of these) This enables embedders to have 255-N trap codes which is more than enough for Wasmtime for example. Cranelift reserves a few built-in codes for itself which shouldn't eat too much into the trap space. Additionally if Cranelift needs to grow a new trap it can do so pretty easily too. The overall intent of this commit is to reduce the coupling of Wasmtime and Cranelift further and generally refactor Wasmtime to use user traps more often. This additionally shrinks the size of `TrapCode` for storage in various locations, notably it can now infallibly be represented inside of a `MemFlags`. Closes bytecodealliance#9310
alexcrichton
force-pushed
the
make-trap-just-a-byte
branch
from
0712b62
to
cd1d0e3
Compare
alexcrichton
added a commit
to alexcrichton/wasmtime
that referenced
this pull request
Oct 3, 2024
This commit fixes an issue found on OSS-Fuzz for the cranelift-fuzzgen fuzzer which was caused by bytecodealliance#9338 but that PR forgot to fix.
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 3, 2024
This commit fixes an issue found on OSS-Fuzz for the cranelift-fuzzgen fuzzer which was caused by #9338 but that PR forgot to fix.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit refactors the representation of
cranelift_codegen::ir::TrapCodeto be a single byte. The previous enumeration is replaced with an opaque byte-sized structure. Previous variants that Cranelift uses internally are now associatedconstvalues onTrapCodeitself. For exampleTrapCode::IntegerOverflowis nowTrapCode::INTEGER_OVERFLOW. All non-Cranelift traps are now removed and exclusively live in thewasmtime-craneliftcrate now.The representation of a
TrapCodeis now:MemFlagsfor "no trap code"This enables embedders to have 255-N trap codes which is more than enough for Wasmtime for example. Cranelift reserves a few built-in codes for itself which shouldn't eat too much into the trap space. Additionally if Cranelift needs to grow a new trap it can do so pretty easily too.
The overall intent of this commit is to reduce the coupling of Wasmtime and Cranelift further and generally refactor Wasmtime to use user traps more often. This additionally shrinks the size of
TrapCodefor storage in various locations, notably it can now infallibly be represented inside of aMemFlags.Closes #9310