wip

Author: hvitved

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

@@ -2782,24 +2782,30 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
     )
   }
 
-  abstract class Access extends Expr {
-    abstract Type getTypeArgument(TypeArgumentPosition apos, TypePath path);
+  private string noDerefChainBorrow() {
+    exists(DerefChain derefChain, BorrowKind borrow |
+      derefChain.isEmpty() and
+      borrow.isNoBorrow() and
+      result = encodeDerefChainBorrow(derefChain, borrow)
+    )
+  }
 
+  abstract class Access extends ContextTyping::ContextTypedCallCand {
     abstract AstNode getNodeAt(FunctionPosition posAdj);
 
     bindingset[derefChainBorrow]
-    abstract Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path);
+    abstract Type getInferredType(string derefChainBorrow, FunctionPosition posAdj, TypePath path);
 
     abstract Declaration getTarget(string derefChainBorrow);
 
+    /**
+     * Holds if the return type of this call at `path` may have to be inferred
+     * from the context.
+     */
     abstract predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path);
-
-    abstract predicate hasUnknownTypeAt(FunctionPosition pos, TypePath path);
   }
 
-  final private class AssocFunctionCallFinal = AssocFunctionResolution::AssocFunctionCall;
-
-  private class AssocFunctionCallAccess extends Access, ContextTyping::ContextTypedCallCand instanceof AssocFunctionResolution::AssocFunctionCall
+  private class AssocFunctionCallAccess extends Access instanceof AssocFunctionResolution::AssocFunctionCall
   {
     AssocFunctionCallAccess() {
       // handled in the `OperationMatchingInput` module
@@ -2819,7 +2825,7 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
     }
 
     override AstNode getNodeAt(FunctionPosition posAdj) {
-      result = AssocFunctionCallFinal.super.getNodeAt(posAdj)
+      result = AssocFunctionResolution::AssocFunctionCall.super.getNodeAt(posAdj)
     }
 
     pragma[nomagic]
@@ -2858,23 +2864,13 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
       )
     }
 
-    /**
-     * Holds if the return type of this call at `path` may have to be inferred
-     * from the context.
-     */
     pragma[nomagic]
     override predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path) {
       exists(ImplOrTraitItemNode i |
         this.hasUnknownTypeAt(i, this.getTarget(i, derefChainBorrow), pos, path)
       )
-    }
-
-    /**
-     * Holds if the return type of this call at `path` may have to be inferred
-     * from the context.
-     */
-    pragma[nomagic]
-    override predicate hasUnknownTypeAt(FunctionPosition pos, TypePath path) {
+      or
+      derefChainBorrow = noDerefChainBorrow() and
       forex(ImplOrTraitItemNode i, Function f |
         f = CallExprImpl::getResolvedFunction(this) and
         f = i.getAnAssocItem()
@@ -2884,9 +2880,8 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
     }
   }
 
-  private class NonAssocCallExprAccess extends Access, CallExpr, ContextTyping::ContextTypedCallCand
-  {
-    NonAssocCallExprAccess() {
+  private class NonAssocFunctionCallAccess extends Access, CallExpr {
+    NonAssocFunctionCallAccess() {
       forex(ItemNode i | i = CallExprImpl::getResolvedFunction(this) |
         not i instanceof AssocFunction
       )
@@ -2897,18 +2892,18 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
       result = getCallExprTypeArgument(this, apos, path)
     }
 
-    override AstNode getNodeAt(FunctionPosition pos) {
-      result = this.getSyntacticArgument(pos.asArgumentPosition())
+    override AstNode getNodeAt(FunctionPosition posAdj) {
+      result = this.getSyntacticArgument(posAdj.asArgumentPosition())
       or
-      result = this and pos.isReturn()
+      result = this and posAdj.isReturn()
     }
 
     pragma[nomagic]
-    private Type getInferredType(AccessPosition apos, TypePath path) {
-      apos.isTypeQualifier() and
+    private Type getInferredType(FunctionPosition posAdj, TypePath path) {
+      posAdj.isTypeQualifier() and
       result = getCallExprTypeQualifier(this, path, false)
       or
-      result = inferType(this.getNodeAt(apos), path)
+      result = inferType(this.getNodeAt(posAdj), path)
     }
 
     bindingset[derefChainBorrow]
@@ -2918,37 +2913,22 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
     }
 
     pragma[nomagic]
-    private FunctionDeclaration resolveCallTargetViaPathResolution() {
-      result = CallExprImpl::getResolvedFunction(this)
-    }
-
     private Declaration getTarget() {
       exists(ImplOrTraitItemNodeOption i, FunctionDeclaration f |
-        f = this.resolveCallTargetViaPathResolution() and
+        f = CallExprImpl::getResolvedFunction(this) and
         f.isDirectlyFor(i) and
         result = TFunctionDeclaration(i, f)
       )
     }
 
     override Declaration getTarget(string derefChainBorrow) {
-      exists(DerefChain derefChain, BorrowKind borrow |
-        result = this.getTarget() and
-        derefChain.isEmpty() and
-        borrow.isNoBorrow() and
-        derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow)
-      )
-    }
-
-    override predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path) {
-      none()
+      result = this.getTarget() and
+      derefChainBorrow = noDerefChainBorrow()
     }
 
-    /**
-     * Holds if the return type of this call at `path` may have to be inferred
-     * from the context.
-     */
     pragma[nomagic]
-    override predicate hasUnknownTypeAt(FunctionPosition pos, TypePath path) {
+    override predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path) {
+      derefChainBorrow = noDerefChainBorrow() and
       exists(ImplOrTraitItemNodeOption i, FunctionDeclaration f |
         TFunctionDeclaration(i, f) = this.getTarget() and
         this.hasUnknownTypeAt(i.asSome(), f, pos, path)
@@ -2966,20 +2946,13 @@ private Type inferFunctionCallType0(
 ) {
   exists(TypePath path0 |
     n = a.getNodeAt(posAdj) and
-    (
-      exists(string derefChainBorrow |
-        FunctionCallMatchingInput::decodeDerefChainBorrow(derefChainBorrow, derefChain, borrow)
-      |
-        result = FunctionCallMatching::inferAccessType(a, derefChainBorrow, posAdj, path0)
-        or
-        a.hasUnknownTypeAt(derefChainBorrow, posAdj, path0) and
-        result = TUnknownType()
-      )
+    exists(string derefChainBorrow |
+      FunctionCallMatchingInput::decodeDerefChainBorrow(derefChainBorrow, derefChain, borrow)
+    |
+      result = FunctionCallMatching::inferAccessType(a, derefChainBorrow, posAdj, path0)
       or
-      a.hasUnknownTypeAt(posAdj, path0) and
-      result = TUnknownType() and
-      derefChain.isEmpty() and
-      borrow.isNoBorrow()
+      a.hasUnknownTypeAt(derefChainBorrow, posAdj, path0) and
+      result = TUnknownType()
     )
   |
     if
@@ -3012,7 +2985,7 @@ private Type inferFunctionCallTypeSelf(
   MethodCall mc, AstNode n, DerefChain derefChain, TypePath path
 ) {
   exists(FunctionPosition posAdj, BorrowKind borrow, TypePath path0 |
-    result = inferFunctionCallType0(mc, posAdj, n, derefChain, borrow, path0) //and
+    result = inferFunctionCallType0(mc, posAdj, n, derefChain, borrow, path0)
   |
     posAdj.asPosition() = 0 and
     borrow.isNoBorrow() and
@@ -3059,8 +3032,8 @@ private Type inferFunctionCallTypePreCheck(AstNode n, FunctionPosition pos, Type
 }
 
 /**
- * Gets the type of `n` at `path`, where `n` is either a method call or an
- * argument/receiver of a method call.
+ * Gets the type of `n` at `path`, where `n` is either a function call or an
+ * argument/receiver of a function call.
  */
 private predicate inferFunctionCallType =
   ContextTyping::CheckContextTyping<inferFunctionCallTypePreCheck/3>::check/2;
@@ -3114,11 +3087,8 @@ private class TupleLikeVariant extends TupleLikeConstructor instanceof Variant {
 }
 
 /**
- * A matching configuration for resolving types of calls like
- * `foo::bar(baz)` where the target is not a method.
- *
- * This also includes "calls" to tuple variants and tuple structs such
- * as `Result::Ok(42)`.
+ * A matching configuration for resolving types of tuple variants and tuple structs
+ * such as `Result::Ok(42)`.
  */
 private module TupleLikeConstructionMatchingInput implements MatchingInputSig {
   import FunctionPositionMatchingInput