Merge override-expression sized arrays into existing types once resolved #6746
Conversation
This file contains 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
kentslaney
force-pushed
the
issue-6722
branch
from
8b8bc89 to
767250e
Compare
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.
Connections
Resolves #6722
Description
When an array size override-expression resolves into an existing type, naga panics because types are in a unique arena. The solution for when this happens is to add a
Resolvedvariant to thePendingArraySizetype which is unique by the global expression it is initialized by. The struct also has ahandlefield for the type it is being merged into. If any of these are used, compact is called again after the pipeline overrides are resolved. Compact then removes thoseResolvedtypes and maps the handle index to the type it is merging into.Testing
This change modifies the existing tests by adding an array with the size of the test array when the size is overridden.
Checklist
cargo fmt.taplo format.cargo clippy. If applicable, add:cargo xtask testto run tests.CHANGELOG.md. (It's an issue that fixes a change that hadn't been released yet, should it still have a line in the release notes?)