Ensure printed tuple.extract arity is valid #6487
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
We previously printed the size of the tuple operand as the arity, but that printed `1` when the operand is unreachable. We don't allow our text input to use `1` as the arity, so don't print it, either. Instead, print the smallest valid arity, `2`, in this case.
This stack of pull requests is managed by Graphite. Learn more about stacking. |
kripken reviewed Apr 11, 2024
src/passes/Print.cpp Outdated
| // not a valid tuple size. The size we print mostly doesn't matter if the | ||
| // tuple is unreachable, but it does have to be valid. | ||
| auto arity = curr->tuple->type.size(); | ||
| arity = arity < 2 ? 2 : arity; |
There was a problem hiding this comment.
Suggested change
| arity = arity < 2 ? 2 : arity; | |
| arity = std::min(arity, 2); |
| ;; CHECK-NEXT: (drop | ||
| ;; CHECK-NEXT: (tuple.extract 1 1 | ||
| ;; CHECK-NEXT: (tuple.extract 2 1 | ||
| ;; CHECK-NEXT: (local.tee $tuple |
There was a problem hiding this comment.
Doesn't this depend on the type of $tuple, which happens to be of size 2? That is, if line 571 changed to have 17 items in the tuple, would this still validate?
There was a problem hiding this comment.
Yes, it would still validate because we do not store the expected arity of TupleExtract in the IR, so the validator would not know what the expected arity is, just that the tuple value is unreachable.
This was referenced Apr 11, 2024
kripken approved these changes Apr 11, 2024
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.
We previously printed the size of the tuple operand as the arity, but that
printed
1when the operand is unreachable. We don't allow our text input touse
1as the arity, so don't print it, either. Instead, print the smallestvalid arity,
2, in this case.