hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-26 17:25:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rust: Make getATypeParameterConstraint return a TypeMention again

Browse Source
This commit is contained in:
Tom Hvitved
2026-03-17 20:01:38 +01:00
parent e8e46accc0
commit 98d8cd1d6d
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
shared/typeinference/codeql/typeinference/internal/TypeInference.qll
View File

@@ -336,7 +336,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
* ```
* the type parameter `T` has the constraint `IComparable<T>`.
*/
Type getATypeParameterConstraint(TypeParameter tp, TypePath path);
TypeMention getATypeParameterConstraint(TypeParameter tp);
/**
* Holds if
@@ -1308,7 +1308,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
private module AccessConstraint {
predicate relevantAccessConstraint(
Access a, AccessEnvironment e, Declaration target, AccessPosition apos, TypePath path,
Type constraint
TypeMention constraint
) {
target = a.getTarget(e) and
typeParameterConstraintHasTypeParameter(target, apos, path, constraint, _, _)
@@ -1336,7 +1336,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
}
/** Gets the constraint that this relevant access should satisfy. */
Type getConstraint(Declaration target) {
TypeMention getConstraint(Declaration target) {
relevantAccessConstraint(a, e, target, apos, path, result)
}
@@ -1347,20 +1347,24 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
Location getLocation() { result = a.getLocation() }
}
private module SatisfiesConstraintInput implements SatisfiesTypeInputSig<RelevantAccess> {
predicate relevantConstraint(RelevantAccess at, Type constraint) {
private module SatisfiesTypeParameterConstraintInput implements
SatisfiesConstraintInputSig<RelevantAccess, TypeMention>
{
predicate relevantConstraint(RelevantAccess at, TypeMention constraint) {
constraint = at.getConstraint(_)
}
}
private module SatisfiesTypeParameterConstraint =
SatisfiesConstraint<RelevantAccess, TypeMention, SatisfiesTypeParameterConstraintInput>;
predicate satisfiesConstraintType(
Access a, AccessEnvironment e, Declaration target, AccessPosition apos, TypePath prefix,
Type constraint, TypePath path, Type t
TypeMention constraint, TypePath path, Type t
) {
exists(RelevantAccess ra |
ra = MkRelevantAccess(a, apos, e, prefix) and
SatisfiesType<RelevantAccess, SatisfiesConstraintInput>::satisfiesConstraintType(ra,
constraint, path, t) and
SatisfiesTypeParameterConstraint::satisfiesConstraintType(ra, constraint, path, t) and
constraint = ra.getConstraint(target)
)
}
@@ -1469,17 +1473,17 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
*/
pragma[nomagic]
private predicate typeParameterConstraintHasTypeParameter(
Declaration target, AccessPosition apos, TypePath pathToConstrained, Type constraint,
Declaration target, AccessPosition apos, TypePath pathToConstrained, TypeMention constraint,
TypePath pathToTp, TypeParameter tp
) {
exists(DeclarationPosition dpos, TypeParameter constrainedTp |
accessDeclarationPositionMatch(apos, dpos) and
constrainedTp = target.getTypeParameter(_) and
constraint = getATypeParameterConstraint(constrainedTp) and
tp = target.getTypeParameter(_) and
tp = getATypeParameterConstraint(constrainedTp, pathToTp) and
tp = constraint.getTypeAt(pathToTp) and
constrainedTp != tp and
constrainedTp = target.getDeclaredType(dpos, pathToConstrained) and
constraint = getATypeParameterConstraint(constrainedTp, TypePath::nil())
constrainedTp = target.getDeclaredType(dpos, pathToConstrained)
)
}
@@ -1488,7 +1492,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
) {
not exists(getTypeArgument(a, target, tp, _)) and
exists(Type constraint, AccessPosition apos, TypePath pathToTp, TypePath pathToTp2 |
exists(TypeMention constraint, AccessPosition apos, TypePath pathToTp, TypePath pathToTp2 |
typeParameterConstraintHasTypeParameter(target, apos, pathToTp2, constraint, pathToTp, tp) and
AccessConstraint::satisfiesConstraintType(a, e, target, apos, pathToTp2, constraint,
pathToTp.appendInverse(path), t)