[naga] Disallow logical operators && and || on vectors
#7368
+65
−5
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
andyleiserson
force-pushed
the
vector-logical-ops
branch
from
a2a8498 to
0dfe371
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR updates the operator handling to disallow the use of logical operators (&& and ||) on vectors according to WGSL specifications.
- Enforces scalar-only operands for && and || in the type-checking phase.
- Updates constant evaluation to immediately error out on vector operands.
- Adds tests and updates the changelog to validate and document these restrictions.
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| naga/tests/wgsl_errors.rs | Added tests to verify error handling for logical operators on vectors |
| naga/src/proc/typifier.rs | Revised type-checking to permit only scalar operands for logical ops |
| naga/src/proc/constant_evaluator.rs | Adjusted constant evaluation to error on unsupported vector usage |
| CHANGELOG.md | Documented removal of logical operators on vectors |
|
Imma try this "review by copilot" thing, we'll see how it does |
cwfitzgerald
approved these changes
Mar 27, 2025
| "fn foo(a: vec2<bool>, b: vec2<bool>) { | ||
| let y = a || b; | ||
| }", | ||
| r#"error: Incompatible operands: LogicalOr(Vector { size: Bi, scalar: Scalar { kind: Bool, width: 1 } }, _) |
There was a problem hiding this comment.
Is this currently the best we can do with the current infra? @jimblandy did you do a thing wrt this, or am I misremembering.
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 #6856
Description
This change disallows the logical operators
&&and||on vectors, which WGSL does not allow. There are two relevant codepaths, one for constant evaluation and one for type checking of expressions to be evaluated at runtime.I tested this change locally in combination with #7339. The two changes actually do not conflict and interact minimally. In #7339, I implemented a transformation while lowering to IR that gets applied only if the operands have a correct (scalar) type. If the operands are not scalars, the expression is passed through with the expectation that validation rejects it. This change affects what will ultimately pass validation.
Arguably, these operators should be removed from the Naga IR entirely. I have not done that, because the
BinaryOperatorenum is shared by the AST and IR representations.Testing
Added tests in wgsl_errors to verify both operators are rejected in both const and runtime contexts.
Squash or Rebase? Squash
Checklist
cargo fmt.taplo format.cargo clippy --tests. If applicable, add:--target wasm32-unknown-unknowncargo xtask testto run tests.CHANGELOG.mdentry.