wip2

Author: hvitved

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

@@ -1108,7 +1108,9 @@ private module ContextTyping {
   abstract class ContextTypedCallCand extends Expr {
     abstract Type getTypeArgument(TypeArgumentPosition apos, TypePath path);
 
-    predicate hasTypeArgument(TypeArgumentPosition apos) { exists(this.getTypeArgument(apos, _)) }
+    predicate hasTypeArgument(TypeArgumentPosition apos) {
+      this.getTypeArgument(apos, _) != TUnknownType()
+    }
 
     /**
      * Holds if this call resolves to `target` inside `i`, and the return type
@@ -2962,7 +2964,7 @@ private module ConstructionMatchingInput implements MatchingInputSig {
         not exists(FunctionPosition pos2 | not pos2.isReturn() and tp = d.getDeclaredType(pos2, _)) and
         // check that no explicit type arguments have been supplied for `tp`
         not exists(TypeArgumentPosition tapos |
-          exists(this.getTypeArgument(tapos, _)) and
+          this.getTypeArgument(tapos, _) != TUnknownType() and
           TTypeParamTypeParameter(tapos.asTypeParam()) = tp
         )
       )

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

@@ -695,6 +695,10 @@ private module MkTypeMention<getAdditionalPathTypeAtSig/2 getAdditionalPathTypeA
       )
     }
   }
+
+  class InferTypeReprMention extends TypeMentionImpl, InferTypeRepr {
+    override Type getTypeAt(TypePath path) { result = TUnknownType() and path.isEmpty() }
+  }
 }
 
 private Type preGetAdditionalPathTypeAt(Path p, TypePath typePath) { none() }

shared/typeinference/codeql/typeinference/internal/TypeInference.qll

@@ -1375,7 +1375,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         exists(TypeArgumentPosition tapos, TypeParameterPosition tppos |
           result = a.getTypeArgument(tapos, path) and
           tp = target.getTypeParameter(tppos) and
-          typeArgumentParameterPositionMatch(tapos, tppos)
+          typeArgumentParameterPositionMatch(tapos, tppos) and
+          not result instanceof UnknownType //and path.isEmpty())
         )
       }
 
@@ -2355,14 +2356,14 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
     module Make3<InputSig3 Input3> {
       private import Input3
 
+      /** Gets the type of `n`, which has an explicit type annotation. */
+      pragma[nomagic]
+      private Type inferAnnotatedType(AstNode n, TypePath path) {
+        result = getTypeAnnotation(n).getTypeAt(path)
+      }
+
       /** Provides logic for inferring certain type information. */
       private module Certain {
-        /** Gets the type of `n`, which has an explicit type annotation. */
-        pragma[nomagic]
-        Type inferAnnotatedType(AstNode n, TypePath path) {
-          result = getTypeAnnotation(n).getTypeAt(path)
-        }
-
         private predicate stepSymmetricCertain(
           AstNode n1, TypePath path1, AstNode n2, TypePath path2
         ) {
@@ -2412,16 +2413,19 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         /** Gets the inferred certain type of `n` at `path`. */
         cached
         Type inferTypeCertain(AstNode n, TypePath path) {
-          CachedStage::ref() and
-          result = inferAnnotatedType(n, path)
-          or
-          result = inferTypeFromStepCertain(n, path)
-          or
-          result = inferTypeCertainSpecific(n, path)
-          or
-          result = inferLogicalOperationType(n, path)
-          or
-          infersCertainTypeAt(n, path, result.getATypeParameter())
+          (
+            CachedStage::ref() and
+            result = inferAnnotatedType(n, path)
+            or
+            result = inferTypeFromStepCertain(n, path)
+            or
+            result = inferTypeCertainSpecific(n, path)
+            or
+            result = inferLogicalOperationType(n, path)
+            or
+            infersCertainTypeAt(n, path, result.getATypeParameter())
+          ) and
+          not result instanceof UnknownType
         }
 
         /**
@@ -2556,6 +2560,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           not Certain::certainTypeConflict(n, prefix, path, result)
         ) and
         (
+          result = inferAnnotatedType(n, path)
+          or
           result = inferTypeFromStep(n, path)
           or
           result = TopDownTyping<inferTypeFromLubStepTopDown/2>::inferType(n, path)