[naga] Don't treat Emit statements as return statements during ensure_block_returns() #7013
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
…_block_returns() Doing so caused proc::ensure_block_returns() to skip appending a return statement to some blocks, without which we are unable to validate that non-void functions have explicit return statements. A consequence of this change would be that some void functions generated by the backends would now end with useless return statements. This already occurs in some cases, but would become more common. To avoid this, we now only call ensure_block_terminates() for a function if it has a return type. This removes a lot of unnecessary return statements from our shader test snapshots.
ErichDonGubler
approved these changes
Jan 28, 2025
|
Oh, shoot, I realized that there's not a |
jamienicol
added a commit
to jamienicol/wgpu
that referenced
this pull request
Jan 29, 2025
This is a partial reversion of gfx-rs#7013. The fix for the actual validation bug remains - ie ensuring that validation correctly rejects shaders containing functions with return types that do not return a value. But this reverts the additional change made to avoid adding superfluous return statements to the end of functions *without* return types. This was done for aesthetics without proper discussion of the technicalities. Perhaps we will revisit this when we follow up in Additionally add a changelog entry for gfx-rs#7013.
6 tasks
|
@ErichDonGubler I added a changelog entry in #7021 (and reverted the part which removes the return statement from void functions) |
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
Fixes #4395
Description
terminator.rs'
ensure_block_returns()function was incorrectly treatingEmitstatements as a valid return. This causes us to omit appending aStatement::Return { value: None }statement to some functions. Without such statement we cannot validate that the (lack of) value returned from the function matches the function's return type.Testing
Added new test
Checklist
cargo fmt.taplo format.cargo clippy. If applicable, add:--target wasm32-unknown-unknowncargo xtask testto run tests.CHANGELOG.md. See simple instructions inside file.