[naga] Restore return statement at end of functions without return types #7021
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
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
approved these changes
Jan 29, 2025
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
This is a partial reversion of #7013, and adds the changelog entry for it
Description
This keeps the bug fix from #7013 but 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 #7015
Testing
Inspected shader snapshots. Ran validation.
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.