Fix inner block problem with 'catch' #3129
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
aheejin
commented
Sep 14, 2020
| // block. Can be used when we need to assume certain number of values are on top | ||
| // of the stack in the beginning. | ||
| Expression* WasmBinaryBuilder::getBlockOrSingleton(Type type, | ||
| unsigned numPops) { |
There was a problem hiding this comment.
This numPops thing was added to be used by catch, but now it does not use this method anymore, so deleted it.
| @@ -2757,12 +2747,12 @@ void WasmBinaryBuilder::visitLoop(Loop* curr) { | |||
| auto start = expressionStack.size(); | |||
| processExpressions(); | |||
| size_t end = expressionStack.size(); | |||
| if (start > end) { | |||
| throwError("block cannot pop from outside"); | |||
| } | |||
There was a problem hiding this comment.
This was just moved to make code cleaner (in my opinion)
aheejin
commented
Sep 14, 2020
| @@ -0,0 +1,19 @@ | |||
| (module | |||
There was a problem hiding this comment.
The original break-within-catch.wasm's wasm2wat output is this:
(module
(type (;0;) (func))
(func (;0;) (type 0)
try ;; label = @1
nop
catch
drop
br 0 (;@1;)
end))
kripken
approved these changes
Sep 14, 2020
src/wasm/wasm-binary.cpp
Outdated
| auto* block = allocator.alloc<Block>(); | ||
| block->list.push_back(curr); | ||
| block->name = catchLabel; | ||
| block->finalize(curr->type); |
There was a problem hiding this comment.
this could use a Builder and builder.makeBlock(catchLabel, curr) on a single line.
(maybe the previous block allocation too, but it's not an obvious win there since you need to manually call pushBlockElements anyhow.)
There was a problem hiding this comment.
Done. Left the previous allocation as is, because of pushBlockElements as you said.
Co-authored-by: Alon Zakai <[email protected]>
This was referenced Jan 13, 2021
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 #3114.