Fix inner block problem with 'catch'#3129
Conversation
| // 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.
| 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)
| @@ -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
left a comment
kripken
left a comment
There was a problem hiding this comment.
Nice!
Comment changes are just suggestions, not sure how much they help.
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 <alonzakai@gmail.com>
2 participants
Fixes #3114.