wip2

Author: hvitved

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

@@ -1351,7 +1351,7 @@ private module AssocFunctionResolution {
    * `i`, and the type at position `posAdj` is `t`.
    */
   pragma[nomagic]
-  private predicate assocFunctionInfo(
+  predicate assocFunctionInfo(
     Function f, string name, int arity, ImplOrTraitItemNode i, FunctionPosition posAdj,
     AssocFunctionType t
   ) {
@@ -2699,45 +2699,44 @@ private module AssocFunctionResolution {
 }
 
 /**
- * A matching configuration for resolving types of method call expressions
+ * A matching configuration for resolving types of function call expressions
  * like `foo.bar(baz)`.
  */
-private module MethodCallMatchingInput implements MatchingWithEnvironmentInputSig {
+private module FunctionCallMatchingInput implements MatchingWithEnvironmentInputSig {
   import FunctionPositionMatchingInput
 
-  private class MethodDeclaration extends Method, FunctionDeclaration { }
-
   private newtype TDeclaration =
-    TMethodFunctionDeclaration(ImplOrTraitItemNode i, MethodDeclaration m) { m.isAssoc(i) }
+    TFunctionDeclaration(ImplOrTraitItemNodeOption i, FunctionDeclaration f) { f.isFor(i) }
 
-  final class Declaration extends TMethodFunctionDeclaration {
-    ImplOrTraitItemNode parent;
-    ImplOrTraitItemNodeOption someParent;
-    MethodDeclaration m;
+  final class Declaration extends TFunctionDeclaration {
+    ImplOrTraitItemNodeOption i;
+    FunctionDeclaration f;
 
-    Declaration() {
-      this = TMethodFunctionDeclaration(parent, m) and
-      someParent.asSome() = parent
-    }
+    Declaration() { this = TFunctionDeclaration(i, f) }
 
-    predicate isMethod(ImplOrTraitItemNode i, Method method) {
-      this = TMethodFunctionDeclaration(i, method)
+    predicate isAssocFunction(ImplOrTraitItemNode i_, Function f_) {
+      i_ = i.asSome() and
+      f_ = f
     }
 
     TypeParameter getTypeParameter(TypeParameterPosition ppos) {
-      result = m.getTypeParameter(someParent, ppos)
+      result = f.getTypeParameter(i, ppos)
     }
 
     Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
-      result = m.getParameterType(someParent, dpos, path)
+      result = f.getParameterType(i, dpos, path)
       or
       dpos.isReturn() and
-      result = m.getReturnType(someParent, path)
+      result = f.getReturnType(i, path)
     }
 
-    string toString() { result = m.toStringExt(parent) }
+    string toString() {
+      i.isNone() and result = f.toString()
+      or
+      result = f.toStringExt(i.asSome())
+    }
 
-    Location getLocation() { result = m.getLocation() }
+    Location getLocation() { result = f.getLocation() }
   }
 
   class AccessEnvironment = string;
@@ -2758,10 +2757,26 @@ private module MethodCallMatchingInput implements MatchingWithEnvironmentInputSi
     )
   }
 
+  abstract class Access extends Expr {
+    abstract Type getTypeArgument(TypeArgumentPosition apos, TypePath path);
+
+    abstract AstNode getNodeAt(FunctionPosition posAdj);
+
+    bindingset[derefChainBorrow]
+    abstract Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path);
+
+    abstract Declaration getTarget(string derefChainBorrow);
+
+    abstract predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path);
+
+    abstract predicate hasUnknownTypeAt(FunctionPosition pos, TypePath path);
+  }
+
   final private class AssocFunctionCallFinal = AssocFunctionResolution::AssocFunctionCall;
 
-  class Access extends AssocFunctionCallFinal, ContextTyping::ContextTypedCallCand {
-    Access() {
+  private class AssocFunctionCallAccess extends Access, ContextTyping::ContextTypedCallCand instanceof AssocFunctionResolution::AssocFunctionCall
+  {
+    AssocFunctionCallAccess() {
       // handled in the `OperationMatchingInput` module
       not this instanceof Operation
     }
@@ -2778,23 +2793,27 @@ private module MethodCallMatchingInput implements MatchingWithEnvironmentInputSi
       result = getCallExprTypeArgument(this, apos, path)
     }
 
+    override AstNode getNodeAt(FunctionPosition posAdj) {
+      result = AssocFunctionCallFinal.super.getNodeAt(posAdj)
+    }
+
     pragma[nomagic]
     private Type getInferredSelfType(FunctionPosition pos, string derefChainBorrow, TypePath path) {
       exists(DerefChain derefChain, BorrowKind borrow |
-        result = this.getSelfTypeAt(pos.getFunctionCallAdjusted(), derefChain, borrow, path) and
+        result = super.getSelfTypeAt(pos.getFunctionCallAdjusted(), derefChain, borrow, path) and
         derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow) and
         pos.isSelf()
       )
     }
 
     pragma[nomagic]
     private Type getInferredNonSelfType(FunctionPosition pos, TypePath path) {
-      result = this.getTypeAt(pos.getFunctionCallAdjusted(), path) and
+      result = super.getTypeAt(pos.getFunctionCallAdjusted(), path) and
       not pos.isSelf()
     }
 
     bindingset[derefChainBorrow]
-    Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path) {
+    override Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path) {
       result = this.getInferredSelfType(pos, derefChainBorrow, path)
       or
       result = this.getInferredNonSelfType(pos, path)
@@ -2803,14 +2822,14 @@ private module MethodCallMatchingInput implements MatchingWithEnvironmentInputSi
     Method getTarget(ImplOrTraitItemNode i, string derefChainBorrow) {
       exists(DerefChain derefChain, BorrowKind borrow |
         derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow) and
-        result = this.resolveCallTarget(i, derefChain, borrow) // mutual recursion; resolving method calls requires resolving types and vice versa
+        result = super.resolveCallTarget(i, derefChain, borrow) // mutual recursion; resolving method calls requires resolving types and vice versa
       )
     }
 
-    Declaration getTarget(string derefChainBorrow) {
-      exists(ImplOrTraitItemNode i, Method m |
-        m = this.getTarget(i, derefChainBorrow) and
-        result = TMethodFunctionDeclaration(i, m)
+    override Declaration getTarget(string derefChainBorrow) {
+      exists(ImplOrTraitItemNodeOption i, Function f |
+        f = this.getTarget(i.asSome(), derefChainBorrow) and
+        result = TFunctionDeclaration(i, f)
       )
     }
 
@@ -2819,7 +2838,7 @@ private module MethodCallMatchingInput implements MatchingWithEnvironmentInputSi
      * from the context.
      */
     pragma[nomagic]
-    predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path) {
+    override predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path) {
       exists(ImplOrTraitItemNode i |
         this.hasUnknownTypeAt(i, this.getTarget(i, derefChainBorrow), pos, path)
       )
@@ -2830,7 +2849,7 @@ private module MethodCallMatchingInput implements MatchingWithEnvironmentInputSi
      * from the context.
      */
     pragma[nomagic]
-    predicate hasUnknownTypeAt(FunctionPosition pos, TypePath path) {
+    override predicate hasUnknownTypeAt(FunctionPosition pos, TypePath path) {
       forex(ImplOrTraitItemNode i, Function f |
         f = CallExprImpl::getResolvedFunction(this) and
         f = i.getAnAssocItem()
@@ -2841,11 +2860,11 @@ private module MethodCallMatchingInput implements MatchingWithEnvironmentInputSi
   }
 }
 
-private module MethodCallMatching = MatchingWithEnvironment<MethodCallMatchingInput>;
+private module FunctionCallMatching = MatchingWithEnvironment<FunctionCallMatchingInput>;
 
 pragma[nomagic]
-private Type inferMethodCallType0(
-  MethodCallMatchingInput::Access a, MethodCallMatchingInput::AccessPosition apos, AstNode n,
+private Type inferFunctionCallType0(
+  FunctionCallMatchingInput::Access a, FunctionCallMatchingInput::AccessPosition apos, AstNode n,
   DerefChain derefChain, BorrowKind borrow, TypePath path
 ) {
   exists(TypePath path0 |
@@ -2854,9 +2873,9 @@ private Type inferMethodCallType0(
       posAdj = apos.getFunctionCallAdjusted()
     |
       exists(string derefChainBorrow |
-        MethodCallMatchingInput::decodeDerefChainBorrow(derefChainBorrow, derefChain, borrow)
+        FunctionCallMatchingInput::decodeDerefChainBorrow(derefChainBorrow, derefChain, borrow)
       |
-        result = MethodCallMatching::inferAccessType(a, derefChainBorrow, apos, path0)
+        result = FunctionCallMatching::inferAccessType(a, derefChainBorrow, apos, path0)
         or
         a.hasUnknownTypeAt(derefChainBorrow, apos, path0) and
         result = TUnknownType()
@@ -2879,8 +2898,8 @@ private Type inferMethodCallType0(
 }
 
 pragma[nomagic]
-private Type inferMethodCallTypeNonSelf(AstNode n, FunctionPosition pos, TypePath path) {
-  result = inferMethodCallType0(_, pos, n, _, _, path) and
+private Type inferFunctionCallTypeNonSelf(AstNode n, FunctionPosition pos, TypePath path) {
+  result = inferFunctionCallType0(_, pos, n, _, _, path) and
   not pos.isSelf()
 }
 
@@ -2893,8 +2912,8 @@ private Type inferMethodCallTypeNonSelf(AstNode n, FunctionPosition pos, TypePat
  */
 pragma[nomagic]
 private Type inferMethodCallTypeSelf(MethodCall mc, AstNode n, DerefChain derefChain, TypePath path) {
-  exists(MethodCallMatchingInput::AccessPosition apos, BorrowKind borrow, TypePath path0 |
-    result = inferMethodCallType0(mc, apos, n, derefChain, borrow, path0) and
+  exists(FunctionCallMatchingInput::AccessPosition apos, BorrowKind borrow, TypePath path0 |
+    result = inferFunctionCallType0(mc, apos, n, derefChain, borrow, path0) and
     apos.isSelf()
   |
     borrow.isNoBorrow() and
@@ -2930,7 +2949,7 @@ private Type inferMethodCallTypeSelf(MethodCall mc, AstNode n, DerefChain derefC
 }
 
 private Type inferMethodCallTypePreCheck(AstNode n, FunctionPosition pos, TypePath path) {
-  result = inferMethodCallTypeNonSelf(n, pos, path)
+  result = inferFunctionCallTypeNonSelf(n, pos, path)
   or
   exists(MethodCall mc |
     result = inferMethodCallTypeSelf(mc, n, DerefChain::nil(), path) and
@@ -3173,11 +3192,11 @@ private module OperationMatchingInput implements MatchingInputSig {
   private import codeql.rust.elements.internal.OperationImpl::Impl as OperationImpl
   import FunctionPositionMatchingInput
 
-  class Declaration extends MethodCallMatchingInput::Declaration {
+  class Declaration extends FunctionCallMatchingInput::Declaration {
     private Method getSelfOrImpl() {
-      result = m
+      result = f
       or
-      m.implements(result)
+      f.implements(result)
     }
 
     pragma[nomagic]
@@ -3220,7 +3239,7 @@ private module OperationMatchingInput implements MatchingInputSig {
 
     Declaration getTarget() {
       exists(ImplOrTraitItemNode i |
-        result.isMethod(i, this.resolveCallTarget(i, _, _)) // mutual recursion
+        result.isAssocFunction(i, this.resolveCallTarget(i, _, _)) // mutual recursion
       )
     }
   }