wip12

Author: hvitved

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

@@ -394,13 +394,7 @@ private module Input3 implements InputSig3 {
     }
   }
 
-  class Call extends Expr instanceof FunctionCallMatchingInput::Access {
-    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-      result = super.getTypeArgument(apos, path)
-    }
-
-    AstNode getNodeAt(TypePosition pos) { result = super.getNodeAt(pos) }
-
+  class Call extends FunctionCallMatchingInput::Access {
     /** Gets the target of this call. */
     Callable getTargetCertain() {
       exists(ImplOrTraitItemNodeOption i, FunctionDeclaration f, Path p |
@@ -617,14 +611,22 @@ private module Input3 implements InputSig3 {
     result = inferTypeFromAnnotationTopDown(n, path)
     or
     result = inferClosureExprBodyTypeTopDown(n, path)
+    or
+    exists(FunctionPosition pos | not pos.isReturn() |
+      result = inferConstructionType(n, pos, path)
+      or
+      result = inferOperationType(n, pos, path)
+    )
   }
 
   Type inferTypeSpecific(AstNode n, TypePath path) {
     result = inferAssignmentOperationType(n, path)
     or
-    result = inferConstructionType(n, path)
-    or
-    result = inferOperationType(n, path)
+    exists(FunctionPosition pos | pos.isReturn() |
+      result = inferConstructionType(n, pos, path)
+      or
+      result = inferOperationType(n, pos, path)
+    )
     or
     result = inferFieldExprType(n, path)
     or
@@ -1082,7 +1084,7 @@ private module ContextTyping {
    * context in which the call appears, for example a call like
    * `Default::default()`.
    */
-  abstract class ContextTypedCallCand extends AstNode {
+  abstract class ContextTypedCallCand extends Expr {
     abstract Type getTypeArgument(TypeArgumentPosition apos, TypePath path);
 
     predicate hasTypeArgument(TypeArgumentPosition apos) { exists(this.getTypeArgument(apos, _)) }
@@ -2653,7 +2655,9 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
     )
   }
 
-  abstract class Access extends ContextTyping::ContextTypedCallCand {
+  final class Access = AccessImpl;
+
+  abstract private class AccessImpl extends ContextTyping::ContextTypedCallCand {
     abstract AstNode getNodeAt(FunctionPosition pos);
 
     bindingset[derefChainBorrow]
@@ -2668,7 +2672,7 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
     abstract predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path);
   }
 
-  private class AssocFunctionCallAccess extends Access instanceof AssocFunctionResolution::AssocFunctionCall
+  private class AssocFunctionCallAccess extends AccessImpl instanceof AssocFunctionResolution::AssocFunctionCall
   {
     AssocFunctionCallAccess() {
       // handled in the `OperationMatchingInput` module
@@ -2755,7 +2759,7 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
     }
   }
 
-  private class NonAssocFunctionCallAccess extends Access instanceof NonAssocCallExpr,
+  private class NonAssocFunctionCallAccess extends AccessImpl instanceof NonAssocCallExpr,
     CallExprImpl::CallExprCall
   {
     pragma[nomagic]
@@ -3024,16 +3028,13 @@ private module ConstructionMatchingInput implements MatchingInputSig {
 private module ConstructionMatching = Matching<ConstructionMatchingInput>;
 
 pragma[nomagic]
-private Type inferConstructionTypePreCheck(AstNode n, FunctionPosition pos, TypePath path) {
+private Type inferConstructionType(AstNode n, FunctionPosition pos, TypePath path) {
   exists(ConstructionMatchingInput::Access a |
     n = a.getNodeAt(pos) and
     result = ConstructionMatching::inferAccessType(a, pos, path)
   )
 }
 
-private predicate inferConstructionType =
-  CheckContextTyping<inferConstructionTypePreCheck/3>::check/2;
-
 pragma[nomagic]
 private Type inferUnknownType(AstNode n, TypePath path) {
   result = TUnknownType() and
@@ -3119,16 +3120,14 @@ private module OperationMatchingInput implements MatchingInputSig {
 private module OperationMatching = Matching<OperationMatchingInput>;
 
 pragma[nomagic]
-private Type inferOperationTypePreCheck(AstNode n, FunctionPosition pos, TypePath path) {
+private Type inferOperationType(AstNode n, FunctionPosition pos, TypePath path) {
   exists(OperationMatchingInput::Access a |
     n = a.getNodeAt(pos) and
     result = OperationMatching::inferAccessType(a, pos, path) and
     if pos.asPosition() = 0 then not path.isEmpty() else any()
   )
 }
 
-private predicate inferOperationType = CheckContextTyping<inferOperationTypePreCheck/3>::check/2;
-
 pragma[nomagic]
 private Type getFieldExprLookupType(FieldExpr fe, string name, DerefChain derefChain) {
   exists(TypePath path |
@@ -3741,11 +3740,10 @@ private module Debug {
   //   n = getRelevantLocatable() and
   //   t = inferFunctionCallType(n, path)
   // }
-  predicate debugInferConstructionType(AstNode n, TypePath path, Type t) {
-    n = getRelevantLocatable() and
-    t = inferConstructionType(n, path)
-  }
-
+  // predicate debugInferConstructionType(AstNode n, TypePath path, Type t) {
+  //   n = getRelevantLocatable() and
+  //   t = inferConstructionType(n, path)
+  // }
   predicate debugTypeMention(TypeMention tm, TypePath path, Type type) {
     tm = getRelevantLocatable() and
     tm.getTypeAt(path) = type

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

@@ -2746,7 +2746,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         Call call, CallResolutionContext ctx, TypePosition pos, AstNode n, TypePath path
       ) {
         result = inferCallTypeOut(call, ctx, pos, n, path) and
-        not pos.isReturn()
+        not pos.isReturn() and
+        hasUnknownType(n)
       }
 
       pragma[nomagic]
@@ -2782,36 +2783,6 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         }
       }
 
-      signature Type inferCallTypeSig(AstNode n, TypePosition pos, TypePath path);
-
-      /**
-       * Given a predicate `inferCallType` for inferring the type of a call at a given
-       * position, this module exposes the predicate `check`, which wraps the input
-       * predicate and checks that types are only propagated into arguments when they
-       * are context-typed.
-       */
-      module CheckContextTyping<inferCallTypeSig/3 inferCallType> {
-        pragma[nomagic]
-        private Type inferCallNonReturnType(AstNode n, TypePath prefix, TypePath path) {
-          exists(TypePosition pos |
-            result = inferCallType(n, pos, path) and
-            hasUnknownType(n) and
-            not pos.isReturn() and
-            prefix = path.getAPrefix()
-          )
-        }
-
-        pragma[nomagic]
-        Type check(AstNode n, TypePath path) {
-          result = inferCallType(n, any(TypePosition pos | pos.isReturn()), path)
-          or
-          exists(TypePath prefix |
-            result = inferCallNonReturnType(n, prefix, path) and
-            hasUnknownTypeAt(n, prefix)
-          )
-        }
-      }
-
       /**
        * Gets the inferred root type of `n`, if any.
        */