-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Rust: Rework type inference for method calls #20282
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.
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
base: main
Are you sure you want to change the base?
Rust: Rework type inference for method calls #20282
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
e4cfb86
to
4a8c37c
Compare
4a8c37c
to
e75d79e
Compare
|
||
/** | ||
* Holds if `constraint` might occur as the third argument of | ||
* `potentialInstantiationOf`. Defaults to simply projecting the third | ||
* argument of `potentialInstantiationOf`. | ||
*/ | ||
default predicate relevantTypeMention(TypeMention tm) { potentialInstantiationOf(_, _, tm) } | ||
default predicate relevantTypeMention(Constraint tm) { potentialInstantiationOf(_, _, tm) } |
Check warning
Code scanning / CodeQL
Missing QLDoc for parameter Warning
61866bf
to
2d1ed65
Compare
2d1ed65
to
3d19a06
Compare
3d19a06
to
153c10b
Compare
153c10b
to
e161d4c
Compare
dd45f7b
to
a20c440
Compare
f45d2d5
to
f9f8782
Compare
pragma[nomagic] | ||
private Type inferMethodCallExprType(AstNode n, TypePath path) { | ||
exists( | ||
MethodCallMatchingInput::Access a, MethodCallMatchingInput::AccessPosition apos, string state, |
Check warning
Code scanning / CodeQL
Omittable 'exists' variable Warning
in this argument
f9f8782
to
4bfd7aa
Compare
| | ||
functionResolutionDependsOnArgument(impl, _, result, pos, _, _) | ||
or | ||
exists(TypeParameter tp | traitTypeParameterOccurrence(trait, resolved, _, pos, _, tp) | |
Check warning
Code scanning / CodeQL
Omittable 'exists' variable Warning
in this argument
4bfd7aa
to
8cd0e06
Compare
* `self5` | `impl T2 for X` | `X` | ||
*/ | ||
private class FunctionPositionType extends TFunctionPositionType { | ||
private predicate asFunctionPositionType(Function f, FunctionPosition pos, ImplOrTraitItemNode i) { |
Check warning
Code scanning / CodeQL
Predicates starting with "get" or "as" should return a value Warning
|
||
pragma[nomagic] | ||
abstract Type getParameterType(DeclarationPosition dpos, TypePath path); | ||
private predicate asInheritedFunctionPositionType( |
Check warning
Code scanning / CodeQL
Predicates starting with "get" or "as" should return a value Warning
eb173a1
to
39b1a4a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR reworks type inference for method calls in the Rust codeQL extractor, addressing a major limitation where method calls with multiple potential targets couldn't be properly resolved. The changes implement a more sophisticated approach that distinguishes between stateful and stateless contexts to improve method resolution accuracy.
Key changes:
- Introduced stateful type inference to handle method calls with multiple candidates
- Updated type inference infrastructure to support state-based resolution
- Enhanced method call target resolution for complex scenarios
Reviewed Changes
Copilot reviewed 34 out of 36 changed files in this pull request and generated 2 comments.
File | Description |
---|---|
shared/typeinference/codeql/typeinference/internal/TypeInference.qll |
Major refactoring to support stateful type inference, introducing MatchingWithState module and state-based method resolution |
rust/ql/lib/codeql/rust/internal/TypeMention.qll |
Added new type mention classes including SelfParameterImplicitMention for handling implicit self parameters |
rust/ql/lib/codeql/rust/internal/Type.qll |
Added support for union types, never type, and pointer types, enhancing the type system coverage |
Multiple .expected files |
Updated test expectations reflecting improved method call resolution accuracy |
filepath.matches("%/main.rs") and | ||
startline = 52 | ||
startline = 167 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This hardcoded line number (167) in the debug module appears to be a leftover from development/testing. Consider removing this specific line constraint or making it configurable to avoid issues when the test file structure changes.
See below for a potential fix:
filepath.matches("%/main.rs")
Copilot uses AI. Check for mistakes.
39b1a4a
to
b4bd65b
Compare
} | ||
|
||
/** Holds if this relevant access should satisfy `constraint`. */ | ||
Type getConstraint() { relevantAccessConstraint(a, target, apos, path, result) } | ||
Type getConstraint(Declaration target) { |
Check warning
Code scanning / CodeQL
Missing QLDoc for parameter Warning
b4bd65b
to
cb8a603
Compare
2748229
to
fb5f768
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR reworks type inference for method calls in Rust by enhancing the type inference framework to support more complex scenarios. The changes improve method resolution by introducing state-based matching and by correcting type parameter handling.
Key changes:
- Introduction of a state-based type matching system (
MatchingWithState
) that can track additional context during method resolution - Correction of type parameter constraints and constraint satisfaction logic
- Extension of type system to support additional Rust types and improve dereference handling
Reviewed Changes
Copilot reviewed 32 out of 34 changed files in this pull request and generated no comments.
Show a summary per file
File | Description |
---|---|
shared/typeinference/codeql/typeinference/internal/TypeInference.qll |
Major refactoring introducing MatchingWithState module and correcting type parameter constraint handling |
rust/ql/lib/codeql/rust/internal/TypeMention.qll |
Adds support for additional type mentions including union types, never types, and pointer types |
rust/ql/lib/codeql/rust/internal/Type.qll |
Extends type system with union, never, and pointer types |
rust/ql/lib/codeql/rust/internal/PathResolution.qll |
Adds trait visibility helpers and improves debugging support |
rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll |
Adds modeling for Deref and Index traits |
rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll |
Implements field access for union types |
rust/ql/lib/codeql/rust/elements/internal/OperationImpl.qll |
Exposes operator overloading information |
Multiple test files | Updated expected results reflecting improved type inference |
Comments suppressed due to low confidence (1)
shared/typeinference/codeql/typeinference/internal/TypeInference.qll:1
- The removed code appears to be checking for inconsistent type parameter instantiations by comparing different paths for the same type parameter. The removal of this logic could allow incorrect type matches to pass through. This should be verified as intentional or the logic should be restored with proper implementation.
/**
fb5f768
to
6f6437f
Compare
pragma[nomagic] | ||
private Type getACandidateReceiverTypeAtNoBorrowNoMatch(TypePath path, string derefChain) { | ||
result = this.getACandidateReceiverTypeAtNoBorrow(path, derefChain) and | ||
exists(Type type, string name, int arity, string derefChainBorrow | |
Check warning
Code scanning / CodeQL
Omittable 'exists' variable Warning
in this argument
pragma[nomagic] | ||
private Type getACandidateReceiverTypeAtNoBorrowNoMatch(TypePath path, string derefChain) { | ||
result = this.getACandidateReceiverTypeAtNoBorrow(path, derefChain) and | ||
exists(Type type, string name, int arity, string derefChainBorrow | |
Check warning
Code scanning / CodeQL
Omittable 'exists' variable Warning
in this argument
pragma[nomagic] | ||
private Type getACandidateReceiverTypeAtNoMatch(TypePath path, string derefChain) { | ||
result = this.getACandidateReceiverTypeAtNoBorrowNoMatch(path, derefChain) and | ||
exists(Type type, string name, int arity, string derefChainBorrow | |
Check warning
Code scanning / CodeQL
Omittable 'exists' variable Warning
in this argument
pragma[nomagic] | ||
private Type getACandidateReceiverTypeAtNoMatch(TypePath path, string derefChain) { | ||
result = this.getACandidateReceiverTypeAtNoBorrowNoMatch(path, derefChain) and | ||
exists(Type type, string name, int arity, string derefChainBorrow | |
Check warning
Code scanning / CodeQL
Omittable 'exists' variable Warning
in this argument
predicate potentialInstantiationOf( | ||
MethodCallCand mcc, TypeAbstraction abs, FunctionPositionType constraint | ||
) { | ||
exists(MethodCall mc, Type type, string name, int arity | |
Check warning
Code scanning / CodeQL
Omittable 'exists' variable Warning
in this argument
predicate potentialInstantiationOf( | ||
MethodCallCand mcc, TypeAbstraction abs, FunctionPositionType constraint | ||
) { | ||
exists(MethodCall mc, Type type, string name, int arity | |
Check warning
Code scanning / CodeQL
Omittable 'exists' variable Warning
No description provided.