Preserve multivalue drops in IRBuilder #6150
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
| Current dependencies on/for this PR:
This stack of pull requests is managed by Graphite. |
tlively force-pushed the irbuilder-multivalue-drop branch 3 times, most recently from 5e5eb7a to 265d280 Compare 
In Binaryen IR, we allow single `Drop` expressions to drop multiple values packaged up as a tuple. When using IRBuilder to rebuild IR containing such a drop, it previously treated the drop as a normal WebAssembly drop that dropped only a single value, producing invalid IR that had extra, undropped values. Fix the problem by preserving the arity of `Drop` inputs in IRBuilder. To avoid bloating the IR, thread the size of the desired value through IRBuilder's pop implementation so that tuple values do not need to be split up and recombined.
tlively force-pushed the irbuilder-multivalue-drop branch from 265d280 to 19a89ad Compare 
ashleynh approved these changes Dec 13, 2023
src/wasm-ir-builder.h Outdated
| // hoistLastValue(). | ||
| [[nodiscard]] Result<> packageHoistedValue(const HoistedVal&); | ||
| // hoistLastValue(). `sizeHint` is the size of the type we ultimately want to | ||
| // consume, so if the hoisted values has `sizeHint` elements, it is left |
There was a problem hiding this comment.
Suggested change
| // consume, so if the hoisted values has `sizeHint` elements, it is left | |
| // consume, so if the hoisted value has `sizeHint` elements, it is left |
radekdoulik pushed a commit to dotnet/binaryen that referenced this pull request Jul 12, 2024
In Binaryen IR, we allow single `Drop` expressions to drop multiple values packaged up as a tuple. When using IRBuilder to rebuild IR containing such a drop, it previously treated the drop as a normal WebAssembly drop that dropped only a single value, producing invalid IR that had extra, undropped values. Fix the problem by preserving the arity of `Drop` inputs in IRBuilder. To avoid bloating the IR, thread the size of the desired value through IRBuilder's pop implementation so that tuple values do not need to be split up and recombined.
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 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.
In Binaryen IR, we allow single
Dropexpressions to drop multiple valuespackaged up as a tuple. When using IRBuilder to rebuild IR containing such a
drop, it previously treated the drop as a normal WebAssembly drop that dropped
only a single value, producing invalid IR that had extra, undropped values. Fix
the problem by preserving the arity of
Dropinputs in IRBuilder. To avoidbloating the IR, thread the size of the desired value through IRBuilder's pop
implementation so that tuple values do not need to be split up and recombined.