Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wast: fix inline data segment resolution #1993

Merged
merged 2 commits into from
Feb 4, 2025
Merged

wast: fix inline data segment resolution #1993

merged 2 commits into from
Feb 4, 2025

Conversation

Robbepop
Copy link
Collaborator

@Robbepop Robbepop commented Feb 4, 2025

Fixes #1994

@Robbepop Robbepop mentioned this pull request Feb 4, 2025
Closed
@Robbepop
Copy link
Collaborator Author

Robbepop commented Feb 4, 2025 •
edited
Loading

CI tests seems to be failing because they are still expecting incorrect wast resolution results. Please check if this assessment correct.

@alexcrichton
Copy link
Member

Yeah that's expected, you can re-run the tests with BLESS=1 to commit the new copies (and it's expected to see it change as part of this PR)

@Robbepop
Copy link
Collaborator Author

Robbepop commented Feb 4, 2025 •
edited
Loading

CI wit-parser fails with code that is seemingly unrelated to the changes introduced in this PR:
https://github.com/bytecodealliance/wasm-tools/blob/main/crates/wit-parser/src/sizealign.rs#L556

@Robbepop
Copy link
Collaborator Author

Robbepop commented Feb 4, 2025 •
edited
Loading

I cannot reproduce the CI issue locally. Is there someone who has knowledge about this part of the codebase who can tell what is happening?

@alexcrichton
Copy link
Member

Ok tracked that down to #1999, mind rebasing this once that's in?

@Robbepop
Copy link
Collaborator Author

Robbepop commented Feb 4, 2025

Ok tracked that down to #1999, mind rebasing this once that's in?

Ah great! Sure, I am ready. :)

@Robbepop Robbepop force-pushed the rf-fix-inline-data-segment-resolution branch from d2c1200 to c383a63 Compare February 4, 2025 20:55
@alexcrichton alexcrichton added this pull request to the merge queue Feb 4, 2025
Merged via the queue into main with commit 7761cdf Feb 4, 2025
30 checks passed
@alexcrichton alexcrichton deleted the rf-fix-inline-data-segment-resolution branch February 4, 2025 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexcrichton alexcrichton alexcrichton approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

wast: Incorrect inference of pages for memory with inline data segment
2 participants
@Robbepop @alexcrichton