Update interpreter for new EH spec #3498
Merged
Conversation
This file contains hidden or 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
Member
Author
|
Currently the EH spec test fails on |
aheejin
commented
Jan 18, 2021
| WASM_UNREACHABLE("rethrow"); | ||
| */ | ||
| } | ||
| Flow visitRethrow(Rethrow* curr) { WASM_UNREACHABLE("unimp"); } |
Member
Author
There was a problem hiding this comment.
This was moved to RuntimeExpressionRunner, because not rethrow needs an access to the exception stack.
This updates the interpreter for the EH instructions (modulo `delegate`) to match the new spec. Before we had an `exnref` type so threw a `Literal` of `exnref` type which contained `ExceptionPackage`. But now that we don't have `exnref` anymore, so we add the contents of `ExceptionPackage` to `WasmException`, which is used only for the `ExpressionRunner` class hierarchy. `exnref` and `ExceptionPackage` will be removed in a followup CL. This allows nonzero depths for `rethrow` for now for testing; we disallowed that for safety measure, but given that there are no passes that modifies that field, I think the risk is low.
aheejin
force-pushed
the
eh_interpreter
branch
from
c88869a to
a5c6615
Compare
kripken
approved these changes
Jan 19, 2021
Member
kripken
left a comment
kripken
left a comment
There was a problem hiding this comment.
Nice, the rethrowing adds some complexity, but otherwise this is pretty simple and neat.
src/wasm-interpreter.h
Outdated
| } | ||
| // This exception is not caught by this try-catch. Rethrow it. | ||
| throw; | ||
| WASM_UNREACHABLE("try"); |
Member
There was a problem hiding this comment.
is this WASM_UNREACHABLE still needed?
Member
Author
There was a problem hiding this comment.
I guess not. Thanks. Removed.
Member
Author
|
By the way my latest commit title should be not "Remove the unnecessary |
tlively
approved these changes
Jan 21, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 updates the interpreter for the EH instructions (modulo
delegate)to match the new spec. Before we had an
exnreftype so threw aLiteralofexnreftype which containedExceptionPackage. But nowthat we don't have
exnrefanymore, so we add the contents ofExceptionPackagetoWasmException, which is used only for theExpressionRunnerclass hierarchy.exnrefandExceptionPackagewillbe removed in a followup CL.
This allows nonzero depths for
rethrowfor now for testing; wedisallowed that for safety measure, but given that there are no passes
that modifies that field, I think the risk is low.