wasm-interp: Fix catch handlers' value stack sizes #2478
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
sbc100
changed the title
sbc100
reviewed
Oct 1, 2024
| Istream::kInvalidOffset, | ||
| {}, | ||
| {Istream::kInvalidOffset}, | ||
| static_cast<u32>(local_decl_count_), |
There was a problem hiding this comment.
The previous code uses func_->locals.size() here. How is that different? Perhaps you could mention in the PR description how the old code is wrong?
sbc100
reviewed
Oct 1, 2024
src/interp/binary-reader-interp.cc
Outdated
| @@ -856,6 +849,16 @@ Result BinaryReaderInterp::EndFunctionBody(Index index) { | |||
| Result BinaryReaderInterp::OnLocalDeclCount(Index count) { | |||
| local_decl_count_ = count; | |||
| local_count_ = 0; | |||
| // FIXME(Soni): does the value of `values` even matter here? it used to be | |||
| // always 0 when this call was in BeginFunctionBody. | |||
There was a problem hiding this comment.
I'm not sure this FIXME comment is useful, maybe just remove it?
There was a problem hiding this comment.
yeah that's fair.
... ugh, the more we look at all this code the more questionable stuff we find, like the func_->handlers.size() in BeginFunctionBody (which, presumably, always evaluates to 0?). but that's not the fix we came here for.
sbc100
approved these changes
Oct 1, 2024
|
@sbc100 ping? |
sbc100
approved these changes
Oct 1, 2024
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.
Fixes the value stack size of the catch handler. There were two (related) issues here:
func_->locals.size()as soon as the function was available, but it hadn't processed the function's locals yet, so it was always empty. (This might not matter in practice, as it's only used by the "function-wide catch handler", which just rethrows.)Closes #2476
(Split from #2470 )