Simplify and fix heap type counting #5110
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
Annotations on array.get and array.set were not being counted and the code could generally be simplified since `count` already ignores types that don't need to be counted.
|
Current dependencies on/for this PR:
This comment was auto-generated by Graphite. |
kripken
approved these changes
Oct 5, 2022
| @@ -54,17 +54,15 @@ struct CodeScanner | |||
| if (auto* call = curr->dynCast<CallIndirect>()) { | |||
| counts.note(call->heapType); | |||
| } else if (auto* call = curr->dynCast<CallRef>()) { | |||
| if (call->isReturn && call->target->type.isFunction()) { | |||
There was a problem hiding this comment.
The isReturn change makes us count in the way that is correct in the spec but we haven't yet moved to, I think? But the idea is that there's no harm to doing that for now, and eventually this code will become right in binaryen as well?
There was a problem hiding this comment.
We emit a type annotation for non-return call_ref as well since #5079, so this is necessary for correctness.
Merged
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.
Annotations on array.get and array.set were not being counted and the code could
generally be simplified since
countalready ignores types that don't need tobe counted.