Skip to content

Rust: Type inference refactor and improve join orders #20076

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

Merged
merged 3 commits into from
Jul 23, 2025
Merged

Rust: Type inference refactor and improve join orders #20076

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
475d872
Shared, Rust: Adjust type inference predicates to better match use sites
paldepind Jul 17, 2025
bdcecdf
Shared, Rust: Ensure that the constraints in `satisfiesConstraintType…
paldepind Jul 17, 2025
43b2977
Shared, Rust: Reuse `hasTypeConstraint` in `potentialInstantiationOf`…
paldepind Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Shared, Rust: Adjust type inference predicates to better match use sites
  • Loading branch information
@paldepind
paldepind committed Jul 18, 2025
commit 475d872ffb46485bcb6fc50f55cda5be47b723e7
71 changes: 31 additions & 40 deletions shared/typeinference/codeql/typeinference/internal/TypeInference.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1229,11 +1229,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
predicate relevantAccessConstraint(
Access a, Declaration target, AccessPosition apos, TypePath path, Type constraint
) {
exists(DeclarationPosition dpos |
accessDeclarationPositionMatch(apos, dpos) and
target = a.getTarget() and
typeParameterConstraintHasTypeParameter(target, dpos, path, _, constraint, _, _)
)
target = a.getTarget() and
typeParameterConstraintHasTypeParameter(target, apos, path, constraint, _, _)
}

private newtype TRelevantAccess =
Expand Down Expand Up @@ -1276,12 +1273,11 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
}

predicate satisfiesConstraintType(
Access a, AccessPosition apos, TypePath prefix, Type constraint, TypePath path, Type t
Access a, Declaration target, AccessPosition apos, TypePath prefix, Type constraint,
TypePath path, Type t
) {
exists(RelevantAccess at | at = MkRelevantAccess(a, _, apos, prefix) |
SatisfiesConstraint<RelevantAccess, SatisfiesConstraintInput>::satisfiesConstraintType(at,
constraint, path, t)
)
SatisfiesConstraint<RelevantAccess, SatisfiesConstraintInput>::satisfiesConstraintType(MkRelevantAccess(a,
target, apos, prefix), constraint, path, t)
}
}

Expand Down Expand Up @@ -1370,37 +1366,38 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
}

/**
* Holds if `tp1` and `tp2` are distinct type parameters of `target`, the
* declared type at `dpos` mentions `tp1` at `path1`, `tp1` has a base
* type mention of type `constraint` that mentions `tp2` at the path
* `path2`.
* Holds if the declared type of `target` contains a type parameter at
* `apos` and `pathToConstrained` that must satisfy `constraint` and `tp`
* occurs at `pathToTp` in `constraint`.
*
* For this example
* For example, in
* ```csharp
* interface IFoo<A> { }
* T1 M<T1, T2>(T2 item) where T2 : IFoo<T1> { }
* ```
* with the method declaration being the target and the for the first
* parameter position, we have the following
* - `path1 = ""`,
* - `tp1 = T2`,
* with the method declaration being the target and with `apos`
* corresponding to `item`, we have the following
* - `pathToConstrained = ""`,
* - `tp = T1`,
* - `constraint = IFoo`,
* - `path2 = "A"`, and
* - `tp2 = T1`.
* - `pathToTp = "A"`.
*/
pragma[nomagic]
private predicate typeParameterConstraintHasTypeParameter(
Declaration target, DeclarationPosition dpos, TypePath path1, TypeParameter tp1,
Type constraint, TypePath path2, TypeParameter tp2
Declaration target, AccessPosition apos, TypePath pathToConstrained, Type constraint,
TypePath pathToTp, TypeParameter tp
) {
tp1 = target.getTypeParameter(_) and
tp2 = target.getTypeParameter(_) and
tp1 != tp2 and
tp1 = target.getDeclaredType(dpos, path1) and
exists(TypeMention tm |
tm = getATypeParameterConstraint(tp1) and
tm.resolveTypeAt(path2) = tp2 and
constraint = resolveTypeMentionRoot(tm)
exists(DeclarationPosition dpos, TypeParameter constrainedTp |
accessDeclarationPositionMatch(apos, dpos) and
constrainedTp = target.getTypeParameter(_) and
tp = target.getTypeParameter(_) and
constrainedTp != tp and
constrainedTp = target.getDeclaredType(dpos, pathToConstrained) and
exists(TypeMention tm |
tm = getATypeParameterConstraint(constrainedTp) and
tm.resolveTypeAt(pathToTp) = tp and
constraint = resolveTypeMentionRoot(tm)
)
)
}

Expand All @@ -1409,15 +1406,9 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
Access a, Declaration target, TypePath path, Type t, TypeParameter tp
) {
not exists(getTypeArgument(a, target, tp, _)) and
target = a.getTarget() and
Copy link
Contributor

Choose a reason for hiding this comment

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

What has happened to this constraint?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good question. It's implied by AccessConstraint::satisfiesConstraintType(a, target, ...) so including it here didn't add anything.

exists(
Type constraint, AccessPosition apos, DeclarationPosition dpos, TypePath pathToTp,
TypePath pathToTp2
|
accessDeclarationPositionMatch(apos, dpos) and
typeParameterConstraintHasTypeParameter(target, dpos, pathToTp2, _, constraint, pathToTp,
tp) and
AccessConstraint::satisfiesConstraintType(a, apos, pathToTp2, constraint,
exists(Type constraint, AccessPosition apos, TypePath pathToTp, TypePath pathToTp2 |
typeParameterConstraintHasTypeParameter(target, apos, pathToTp2, constraint, pathToTp, tp) and
AccessConstraint::satisfiesConstraintType(a, target, apos, pathToTp2, constraint,
pathToTp.appendInverse(path), t)
)
}
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy