WIP

Author: paldepind

rust/ql/lib/codeql/rust/internal/PathResolution.qll

@@ -2250,8 +2250,10 @@ private module Debug {
   Locatable getRelevantLocatable() {
     exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
       result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-      filepath.matches("%/main.rs") and
-      startline = 52
+      // filepath.matches("%/lex.rs") and
+      // startline = [156 .. 163]
+      filepath.matches("%/algorithm/mod.rs") and
+      startline = [300 .. 303]
     )
   }
 

rust/ql/lib/codeql/rust/internal/typeinference/Type.qll

@@ -75,7 +75,7 @@ abstract class Type extends TType {
   abstract TypeParameter getPositionalTypeParameter(int i);
 
   /** Gets the default type for the `i`th type parameter, if any. */
-  TypeMention getTypeParameterDefault(int i) { none() }
+  TypeRepr getTypeParameterDefault(int i) { none() }
 
   /**
    * Gets a type parameter of this type.
@@ -129,7 +129,7 @@ class DataType extends Type, TDataType {
     result = TTypeParamTypeParameter(typeItem.getGenericParamList().getTypeParam(i))
   }
 
-  override TypeMention getTypeParameterDefault(int i) {
+  override TypeRepr getTypeParameterDefault(int i) {
     result = typeItem.getGenericParamList().getTypeParam(i).getDefaultType()
   }
 
@@ -189,7 +189,7 @@ class TraitType extends Type, TTrait {
     result.(SelfTypeParameter).getTrait() = trait
   }
 
-  override TypeMention getTypeParameterDefault(int i) {
+  override TypeRepr getTypeParameterDefault(int i) {
     result = trait.getGenericParamList().getTypeParam(i).getDefaultType()
   }
 

rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll

@@ -134,15 +134,13 @@ class TypePath = M1::TypePath;
 
 module TypePath = M1::TypePath;
 
-private module Input2 implements InputSig2 {
+private module Input2 implements InputSig2<PreTypeMention> {
   private import TypeMention as TM
 
-  class TypeMention = TM::TypeMention;
-
-  TypeMention getABaseTypeMention(Type t) { none() }
+  PreTypeMention getABaseTypeMention(Type t) { none() }
 
   Type getATypeParameterConstraint(TypeParameter tp, TypePath path) {
-    exists(TypeMention tm | result = tm.resolveTypeAt(path) |
+    exists(TypeMention tm | result = tm.getTypeAt(path) |
       tm = tp.(TypeParamTypeParameter).getTypeParam().getATypeBound().getTypeRepr() or
       tm = tp.(SelfTypeParameter).getTrait() or
       tm =
@@ -162,7 +160,7 @@ private module Input2 implements InputSig2 {
    * inference module for more information.
    */
   predicate conditionSatisfiesConstraint(
-    TypeAbstraction abs, TypeMention condition, TypeMention constraint, boolean transitive
+    TypeAbstraction abs, PreTypeMention condition, PreTypeMention constraint, boolean transitive
   ) {
     // `impl` blocks implementing traits
     transitive = false and
@@ -212,7 +210,7 @@ private module Input2 implements InputSig2 {
   }
 }
 
-private module M2 = Make2<Input2>;
+private module M2 = Make2<PreTypeMention, Input2>;
 
 import M2
 
@@ -236,6 +234,25 @@ module Consistency {
   }
 }
 
+signature predicate relevantTraitSig(AstNode n, Trait t);
+
+module TermSatisfiesTrait<relevantTraitSig/2 relevantTrait> {
+  private class RelevantTerm extends AstNode {
+    RelevantTerm() { relevantTrait(this, _) }
+
+    Type getTypeAt(TypePath path) { result = inferType(this, path) }
+  }
+
+  private module MethodCallSatisfiesDerefConstraintInput implements
+    SatisfiesConstraintInputSig<RelevantTerm>
+  {
+    pragma[nomagic]
+    predicate relevantConstraint(RelevantTerm term, Type constraint) {
+      relevantTrait(term, constraint.(TraitType).getTrait())
+    }
+  }
+}
+
 /** A function without a `self` parameter. */
 private class NonMethodFunction extends Function {
   NonMethodFunction() { not this.hasSelfParam() }
@@ -382,7 +399,7 @@ pragma[nomagic]
 private Type inferAnnotatedType(AstNode n, TypePath path) {
   result = getTypeAnnotation(n).resolveTypeAt(path)
   or
-  result = n.(ShorthandSelfParameterMention).resolveTypeAt(path)
+  result = n.(SelfParam).(TypeMention).resolveTypeAt(path)
 }
 
 pragma[nomagic]
@@ -2330,19 +2347,19 @@ private module MethodResolution {
    * instance of the type being implemented.
    */
   private module TypeQualifierIsInstantiationOfImplSelfInput implements
-    IsInstantiationOfInputSig<MethodCallCallExpr, TypeMentionTypeTree>
+    IsInstantiationOfInputSig<MethodCallCallExpr, TypeMention>
   {
     pragma[nomagic]
     private predicate potentialInstantiationOf0(
-      MethodCallCallExpr ce, ImplItemNode impl, TypeMentionTypeTree constraint
+      MethodCallCallExpr ce, ImplItemNode impl, TypeMention constraint
     ) {
       ce.hasTypeQualifiedCandidate(impl) and
       constraint = impl.getSelfPath()
     }
 
     pragma[nomagic]
     predicate potentialInstantiationOf(
-      MethodCallCallExpr ce, TypeAbstraction abs, TypeMentionTypeTree constraint
+      MethodCallCallExpr ce, TypeAbstraction abs, TypeMention constraint
     ) {
       potentialInstantiationOf0(ce, abs, constraint) and
       if abs.(Impl).hasTrait()
@@ -2353,14 +2370,13 @@ private module MethodResolution {
       else any()
     }
 
-    predicate relevantConstraint(TypeMentionTypeTree constraint) {
+    predicate relevantConstraint(TypeMention constraint) {
       potentialInstantiationOf0(_, _, constraint)
     }
   }
 
   private module TypeQualifierIsInstantiationOfImplSelf =
-    IsInstantiationOf<MethodCallCallExpr, TypeMentionTypeTree,
-      TypeQualifierIsInstantiationOfImplSelfInput>;
+    IsInstantiationOf<MethodCallCallExpr, TypeMention, TypeQualifierIsInstantiationOfImplSelfInput>;
 
   /**
    * A configuration for anti-matching the type of a receiver against the type of
@@ -4138,8 +4154,8 @@ private module Debug {
   Locatable getRelevantLocatable() {
     exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
       result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-      filepath.matches("%/sqlx.rs") and
-      startline = [56 .. 60]
+      filepath.matches("%/algorithm/mod.rs") and
+      startline = [300 .. 303]
     )
   }
 
@@ -4160,9 +4176,9 @@ private module Debug {
     Input2::conditionSatisfiesConstraint(abs, condition, constraint, transitive)
   }
 
-  predicate debugInferShorthandSelfType(ShorthandSelfParameterMention self, TypePath path, Type t) {
+  predicate debugInferShorthandSelfType(SelfParam self, TypePath path, Type t) {
     self = getRelevantLocatable() and
-    t = self.resolveTypeAt(path)
+    t = self.(TypeMention).resolveTypeAt(path)
   }
 
   predicate debugInferMethodCallType(AstNode n, TypePath path, Type t) {