Rust: Make path resolution robust against invalid code with conflicting declarations #21311
+45
−23
Conversation
This file contains hidden or 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
Contributor
There was a problem hiding this comment.
Pull request overview
Improves Rust path resolution to remain performant and deterministic in the presence of invalid Rust code that introduces conflicting declarations (e.g., duplicate names), and adds a regression test covering that scenario.
Changes:
- Add an invalid-Rust test case with conflicting
struct Adeclarations and disablecargo checkfor that fixture. - Update path resolution to avoid combinatorial blow-ups in invalid code by selecting a single (last) matching child item.
- Update expected test output to reflect the new resolution behavior for the invalid fixture.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| rust/ql/lib/codeql/rust/internal/PathResolution.qll | Adjusts child-successor selection to be robust in invalid/conflicting-declaration scenarios. |
| rust/ql/test/library-tests/path-resolution/invalid/main.rs | Adds an invalid Rust fixture with conflicting declarations. |
| rust/ql/test/library-tests/path-resolution/invalid/options.yml | Disables cargo checking for the invalid fixture. |
| rust/ql/test/library-tests/path-resolution/path-resolution.expected | Updates expected results for the new invalid-code path resolution behavior. |
Comments suppressed due to low confidence (1)
rust/ql/test/library-tests/path-resolution/invalid/main.rs:6
- Typo in comment: “precendence” should be “precedence”.
fn f(x: A) {} // $ item=A2 (the later occurence takes precendence)
| struct A; // A1 | ||
| struct A; // A2 | ||
|
|
||
| fn f(x: A) {} // $ item=A2 (the later occurence takes precendence) |
There was a problem hiding this comment.
Typo in comment: “occurence” should be “occurrence”.
This issue also appears on line 6 of the same file.
Suggested change
| fn f(x: A) {} // $ item=A2 (the later occurence takes precendence) | |
| fn f(x: A) {} // $ item=A2 (the later occurrence takes precendence) |
| struct A; // A1 | ||
| struct A; // A2 | ||
|
|
||
| fn f(x: A) {} // $ item=A2 (the later occurence takes precendence) |
There was a problem hiding this comment.
Wording in comment: “the later” is ambiguous here; “the latter” better matches the intent (A2 vs A1).
Suggested change
| fn f(x: A) {} // $ item=A2 (the later occurence takes precendence) | |
| fn f(x: A) {} // $ item=A2 (the latter occurrence takes precedence) |
| not result instanceof NamedItemNode | ||
| or | ||
| // In valid Rust code, there cannot be multiple children with the same name and namespace, | ||
| // but to safe-guard against combinatorial explosions in invalid code, we always pick the |
There was a problem hiding this comment.
Grammar in comment: “to safe-guard” should be “to safeguard”.
Suggested change
| // but to safe-guard against combinatorial explosions in invalid code, we always pick the | |
| // but to safeguard against combinatorial explosions in invalid code, we always pick the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes performance on
edl-lang/edl, which contains e.g. https://github.com/edl-lang/edl/blob/main/tests/ui/impl-trait/impl-trait-plus-priority.rs.