Ensure that inline (data)s and (elem)s count toward identifiers - #2242
Open
bvisness wants to merge 1 commit into
Open
Ensure that inline (data)s and (elem)s count toward identifiers#2242bvisness wants to merge 1 commit into
bvisness wants to merge 1 commit into
Conversation
The (memory (data ...)) and (table (elem ...)) syntax sugar was not correctly counting the indices of the data and elem segments, causing the identifiers' indices on later data and elem segments to be off by one. Because the identifier context needs to be updated as we parse, memory_fields and table_fields are updated to do some of their work in the first pass.
rossberg
reviewed
Sep 3, 2026
rossberg
left a comment
rossberg
left a comment
Member
There was a problem hiding this comment.
Oh, thanks! That must have been a pain to debug, since this code is a mess.
Comment on lines
-1119
to
-1121
| { fun c x loc -> [Memory ($1 c) @@ loc], [], [], [] } | ||
| { fun c -> fun x loc -> [Memory ($1 c) @@ loc], [], [], [] } | ||
| | inline_import memorytype /* Sugar */ | ||
| { fun c x loc -> |
Member
There was a problem hiding this comment.
Nit: these changes are redundant, since the old version is sugar for the new.
Comment on lines
+1196
to
+1201
| { fun c -> fun x loc -> [Table ($1 c, $2 c) @@ loc], [], [], [] } | ||
| | tabletype /* Sugar */ | ||
| { fun c x loc -> let TableT (_, _, (_, ht)) as tt = $1 c in | ||
| { fun c -> fun x loc -> let TableT (_, _, (_, ht)) as tt = $1 c in | ||
| [Table (tt, [RefNull ht @@ loc] @@ loc) @@ loc], [], [], [] } | ||
| | inline_import tabletype /* Sugar */ | ||
| { fun c x loc -> | ||
| { fun c -> fun x loc -> |
Contributor
|
I feel like having a test for this would be a nice addition, would you be willing to add one @bvisness? |
Contributor
Author
|
I went back and forth on including tests because they are very fiddly, identifier-specific, and...where would they go? Do we have a place for "regression tests" of sorts? I'm happy to add one, it's just so niche that I struggled with it. |
Member
|
I think elem.wast and data.wast would be natural places. They aren't really regression tests (nor do I see a need to distinguish those in the test suite). |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
The
(memory (data ...))and(table (elem ...))abbreviations were not correctly counting the indices of the data and elem segments, causing the identifiers' indices on later data and elem segments to be off by one. Because the identifier context needs to be updated as we parse,memory_fieldsandtable_fieldsare updated to do some of their work in the first pass.