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

[naga] Forbid cycles between global expressions and types. #6800

Merged
merged 2 commits into from
Jan 8, 2025
Merged

[naga] Forbid cycles between global expressions and types. #6800

merged 2 commits into from
Jan 8, 2025

Conversation

jimblandy
Copy link
Member

Update valid::handles to traverse Module::types and
Module::global_expressions in tandem, to ensure that the types and
expressions are acyclic.

Fixes #6793.

@jimblandy jimblandy added area: validation Issues related to validation, diagnostics, and error handling naga Shader Translator area: naga middle-end Intermediate representation labels Dec 21, 2024
@jimblandy jimblandy requested a review from a team as a code owner December 21, 2024 18:00
@jimblandy
[naga] Move type handle validation into its own function.
96445a9
@jimblandy
[naga] Forbid cycles between global expressions and types.
75a5565 
Update `valid::handles` to traverse `Module::types` and
`Module::global_expressions` in tandem, to ensure that the types and
expressions are acyclic.

Fixes gfx-rs#6793.
@jimblandy jimblandy force-pushed the naga-validate-override-sized-array-handles branch from 79d747d to 75a5565 Compare December 21, 2024 18:01
@jimblandy jimblandy mentioned this pull request Dec 21, 2024
Open
atlv24
atlv24 approved these changes Dec 28, 2024
View reviewed changes
Copy link
Collaborator

@atlv24 atlv24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comments are spectacular. Would this also catch immediate self-reference of constants? like

const f: f32 = f;

or is it only type <-> expression cycles?

kentslaney added a commit to kentslaney/wgpu that referenced this pull request Jan 3, 2025
@kentslaney
validate order as defined in gfx-rs#6788 (mostly via gfx-rs#6800)
c9c38b2
teoxoy
teoxoy approved these changes Jan 6, 2025
View reviewed changes
Copy link
Member

@teoxoy teoxoy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, left a question.

naga/src/valid/handles.rs
match size {
crate::ArraySize::Pending(pending) => match pending {
crate::PendingArraySize::Expression(expr) => Some(expr),
crate::PendingArraySize::Override(_) => None,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't check the override initializer as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, yes, we should.

@cwfitzgerald cwfitzgerald merged commit 6351c2d into gfx-rs:trunk Jan 8, 2025
27 checks passed
@jimblandy jimblandy mentioned this pull request Jan 8, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@teoxoy teoxoy teoxoy approved these changes

@atlv24 atlv24 atlv24 approved these changes

Assignees

@jimblandy jimblandy

Labels
area: naga middle-end Intermediate representation area: validation Issues related to validation, diagnostics, and error handling naga Shader Translator
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[naga] PendingArraySize::Expression handle not validated
4 participants
@jimblandy @atlv24 @teoxoy @cwfitzgerald