wip2

Author: hvitved

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

@@ -15,7 +15,7 @@ private import TypeInference
  * Holds if `traitBound` is the first non-trivial trait bound of `tp`.
  */
 pragma[nomagic]
-private predicate hasFirstNonTrivialTraitBound(TypeParamItemNode tp, Trait traitBound) {
+predicate hasFirstNonTrivialTraitBound(TypeParamItemNode tp, Trait traitBound) {
   traitBound =
     min(Trait trait, int i |
       trait = tp.resolveBound(i) and

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

@@ -4,6 +4,7 @@ private import Type
 private import TypeAbstraction
 private import TypeMention
 private import TypeInference
+private import BlanketImplementation as BlanketImplementation
 
 private newtype TFunctionPosition =
   TArgumentFunctionPosition(ArgumentPosition pos) or
@@ -263,22 +264,25 @@ Type getNthLookupType(Type t, int n) {
 pragma[nomagic]
 int getLastLookupTypeIndex(Type t) { result = max(int n | exists(getNthLookupType(t, n))) }
 
+bindingset[t]
+private Type subst(Type t) {
+  result = substituteLookupTraits(t) and
+  not result = TNeverType() and
+  not result = TUnknownType()
+}
+
 /**
  * A wrapper around `IsInstantiationOf` which ensures to substitute in lookup
  * traits when checking whether argument types are instantiations of function
  * types.
  */
-module ArgIsInstantiationOf<
+module ArgIsInstantiationOfWithoutConstraints<
   HasTypeTreeSig Arg, IsInstantiationOfInputSig<Arg, AssocFunctionType> Input>
 {
   final private class ArgFinal = Arg;
 
   private class ArgSubst extends ArgFinal {
-    Type getTypeAt(TypePath path) {
-      result = substituteLookupTraits(super.getTypeAt(path)) and
-      not result = TNeverType() and
-      not result = TUnknownType()
-    }
+    Type getTypeAt(TypePath path) { result = subst(super.getTypeAt(path)) }
   }
 
   private module IsInstantiationOfInput implements
@@ -310,6 +314,56 @@ module ArgIsInstantiationOf<
   }
 }
 
+/**
+ * A wrapper around `IsInstantiationOfWithConstraints` which ensures to substitute
+ * in lookup traits when checking whether argument types are instantiations of function
+ * types.
+ */
+module ArgIsInstantiationOf<
+  HasTypeTreeSig Arg, IsInstantiationOfInputSig<Arg, AssocFunctionType> Input>
+{
+  final private class ArgFinal = Arg;
+
+  private class ArgSubst extends ArgFinal {
+    Type getTypeAt(TypePath path) { result = subst(super.getTypeAt(path)) }
+  }
+
+  private module IsInstantiationOfInput implements
+    IsInstantiationOfWithConstraintsInputSig<ArgSubst, AssocFunctionType>
+  {
+    pragma[nomagic]
+    predicate potentialInstantiationOf(
+      ArgSubst arg, TypeAbstraction abs, AssocFunctionType constraint
+    ) {
+      Input::potentialInstantiationOf(arg, abs, constraint)
+    }
+
+    predicate relevantConstraint(AssocFunctionType constraint) {
+      Input::relevantConstraint(constraint)
+    }
+
+    Type getARelevantTypeParameterConstraint(TypeParameter tp) {
+      exists(TypeParam param |
+        tp.(TypeParamTypeParameter).getTypeParam() = param and
+        BlanketImplementation::hasFirstNonTrivialTraitBound(param, result.(TraitType).getTrait())
+      )
+    }
+  }
+
+  private module ArgSubstIsInstantiationOf =
+    IsInstantiationOfWithConstraints<ArgSubst, AssocFunctionType, IsInstantiationOfInput>;
+
+  predicate argIsInstantiationOf(Arg arg, ImplOrTraitItemNode i, AssocFunctionType constraint) {
+    ArgSubstIsInstantiationOf::isInstantiationOf(arg, i, constraint)
+  }
+
+  predicate argIsNotInstantiationOf(
+    Arg arg, ImplOrTraitItemNode i, AssocFunctionType constraint, TypePath path
+  ) {
+    ArgSubstIsInstantiationOf::isNotInstantiationOf(arg, i, constraint, path)
+  }
+}
+
 /**
  * Provides the input for `ArgsAreInstantiationsOf`.
  */
@@ -436,8 +490,6 @@ module ArgsAreInstantiationsOf<ArgsAreInstantiationsOfInputSig Input> {
   /**
    * Holds if all arguments of `call` have types that are instantiations of the
    * types of the corresponding parameters of `f` inside `i`.
-   *
-   * TODO: Check type parameter constraints as well.
    */
   pragma[nomagic]
   predicate argsAreInstantiationsOf(Input::Call call, ImplOrTraitItemNode i, Function f) {
@@ -473,8 +525,6 @@ module ArgsAreInstantiationsOf<ArgsAreInstantiationsOfInputSig Input> {
   /**
    * Holds if _some_ argument of `call` has a type that is not an instantiation of the
    * type of the corresponding parameter of `f` inside `i`.
-   *
-   * TODO: Check type parameter constraints as well.
    */
   pragma[nomagic]
   predicate argsAreNotInstantiationsOf(Input::Call call, ImplOrTraitItemNode i, Function f) {

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

@@ -2311,7 +2311,8 @@ private module MethodResolution {
   }
 
   private module ReceiverIsNotInstantiationOfBlanketLikeSelfParam =
-    ArgIsInstantiationOf<MethodCallCand, ReceiverIsNotInstantiationOfBlanketLikeSelfParamInput>;
+    ArgIsInstantiationOfWithoutConstraints<MethodCallCand,
+      ReceiverIsNotInstantiationOfBlanketLikeSelfParamInput>;
 
   /**
    * A configuration for matching the type qualifier of a method call
@@ -2368,7 +2369,8 @@ private module MethodResolution {
   }
 
   private module ReceiverIsNotInstantiationOfInherentSelfParam =
-    ArgIsInstantiationOf<MethodCallCand, ReceiverIsNotInstantiationOfInherentSelfParamInput>;
+    ArgIsInstantiationOfWithoutConstraints<MethodCallCand,
+      ReceiverIsNotInstantiationOfInherentSelfParamInput>;
 
   /**
    * A configuration for matching the types of positional arguments against the
@@ -2677,8 +2679,12 @@ private module NonMethodResolution {
     f = impl.getASuccessor(_) and
     not impl.(Impl).hasTrait() and
     traitTp = TTypeParamTypeParameter(impl.resolveSelfTy().getTypeParam(0)) and
-    pos.isSelf() and
-    not f.hasSelfParam()
+    not f.hasSelfParam() and
+    (
+      pos.isSelf()
+      or
+      pos.getTypeMention(f) = any(ImplSelfMention self).getParentNode*()
+    )
   }
 
   pragma[nomagic]
@@ -2742,6 +2748,16 @@ private module NonMethodResolution {
       not result.(Function).hasSelfParam()
     }
 
+    /**
+     * Gets the associated function that this function call resolves to using path
+     * resolution, if any.
+     */
+    pragma[nomagic]
+    NonMethodFunction getPathResolutionResolved(ImplOrTraitItemNode i) {
+      result = this.getPathResolutionResolved() and
+      result = i.getAnAssocItem()
+    }
+
     /**
      * Gets the blanket function that this call may resolve to, if any.
      */
@@ -2839,13 +2855,6 @@ private module NonMethodResolution {
       or
       NonMethodArgsAreInstantiationsOfNonBlanket::argsAreInstantiationsOf(this, i, result)
     }
-
-    pragma[nomagic]
-    NonMethodFunction resolveTraitFunctionViaPathResolution(TraitItemNode trait) {
-      this.hasTrait() and
-      result = this.getPathResolutionResolved() and
-      result = trait.getAnAssocItem()
-    }
   }
 
   private newtype TCallAndBlanketPos =
@@ -2959,6 +2968,7 @@ private module NonMethodResolution {
     }
 
     class Call extends NonMethodCall {
+      // Call() { this = Debug::getRelevantLocatable() } // todo
       Type getArgType(FunctionPosition pos, TypePath path) {
         result = getArgType(this, pos, path, _)
       }
@@ -3171,13 +3181,16 @@ private module NonMethodCallMatchingInput implements MatchingInputSig {
     pragma[nomagic]
     predicate hasUnknownTypeAt(FunctionPosition pos, TypePath path) {
       exists(ImplOrTraitItemNodeOption i, NonMethodFunctionDeclaration f |
-        TNonMethodFunctionDeclaration(i, f) = this.getTarget()
-        or
-        f = this.resolveTraitFunctionViaPathResolution(i.asSome())
-      |
+        TNonMethodFunctionDeclaration(i, f) = this.getTarget() and
         this.hasUnknownTypeAt(i.asSome(), f, pos, path)
       )
       or
+      forex(ImplOrTraitItemNode i, NonMethodFunctionDeclaration f |
+        f = this.getPathResolutionResolved(i)
+      |
+        this.hasUnknownTypeAt(i, f, pos, path)
+      )
+      or
       // Tuple declarations, such as `Result::Ok(...)`, may also be context typed
       exists(TupleLikeConstructor tc, TypeParameter tp |
         tc = this.resolveCallTargetViaPathResolution() and
@@ -4077,50 +4090,60 @@ private module Cached {
    */
   cached
   Type inferType(AstNode n, TypePath path) {
-    Stages::TypeInferenceStage::ref() and
-    result = CertainTypeInference::inferCertainType(n, path)
-    or
-    // Don't propagate type information into a node which conflicts with certain
-    // type information.
+    // exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
+    //   n.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+    // |
+    //   not (
+    //     filepath.matches("%/camera.rs") and
+    //     startline = [82 .. 94]
+    //   )
+    // ) and
     (
-      if CertainTypeInference::hasInferredCertainType(n)
-      then not CertainTypeInference::certainTypeConflict(n, path, result)
-      else any()
-    ) and
-    (
-      result = inferAssignmentOperationType(n, path)
-      or
-      result = inferTypeEquality(n, path)
-      or
-      result = inferStructExprType(n, path)
-      or
-      result = inferMethodCallType(n, path)
-      or
-      result = inferNonMethodCallType(n, path)
-      or
-      result = inferOperationType(n, path)
+      Stages::TypeInferenceStage::ref() and
+      result = CertainTypeInference::inferCertainType(n, path)
       or
-      result = inferFieldExprType(n, path)
-      or
-      result = inferTryExprType(n, path)
-      or
-      result = inferLiteralType(n, path, false)
-      or
-      result = inferAwaitExprType(n, path)
-      or
-      result = inferIndexExprType(n, path)
-      or
-      result = inferDereferencedExprPtrType(n, path)
-      or
-      result = inferForLoopExprType(n, path)
-      or
-      result = inferDynamicCallExprType(n, path)
-      or
-      result = inferClosureExprType(n, path)
-      or
-      result = inferStructPatType(n, path)
-      or
-      result = inferTupleStructPatType(n, path)
+      // Don't propagate type information into a node which conflicts with certain
+      // type information.
+      (
+        if CertainTypeInference::hasInferredCertainType(n)
+        then not CertainTypeInference::certainTypeConflict(n, path, result)
+        else any()
+      ) and
+      (
+        result = inferAssignmentOperationType(n, path)
+        or
+        result = inferTypeEquality(n, path)
+        or
+        result = inferStructExprType(n, path)
+        or
+        result = inferMethodCallType(n, path)
+        or
+        result = inferNonMethodCallType(n, path)
+        or
+        result = inferOperationType(n, path)
+        or
+        result = inferFieldExprType(n, path)
+        or
+        result = inferTryExprType(n, path)
+        or
+        result = inferLiteralType(n, path, false)
+        or
+        result = inferAwaitExprType(n, path)
+        or
+        result = inferIndexExprType(n, path)
+        or
+        result = inferDereferencedExprPtrType(n, path)
+        or
+        result = inferForLoopExprType(n, path)
+        or
+        result = inferDynamicCallExprType(n, path)
+        or
+        result = inferClosureExprType(n, path)
+        or
+        result = inferStructPatType(n, path)
+        or
+        result = inferTupleStructPatType(n, path)
+      )
     )
   }
 }
@@ -4137,8 +4160,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("%/overloading.rs") and
+      startline = 276
     )
   }
 

rust/ql/test/library-tests/type-inference/type-inference.expected

@@ -14369,3 +14369,4 @@ inferType
 | raw_pointer.rs:59:5:59:30 | raw_type_from_deref(...) |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:59:25:59:29 | false |  | {EXTERNAL LOCATION} | bool |
 testFailures
+| main.rs:2222:32:2222:132 | //... | Fixed spurious result: target=S::my_add2 |