wip12

Author: hvitved

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

@@ -428,14 +428,6 @@ private module Input3 implements InputSig3 {
             .getAdditionalTypeBound(this.getFunction(), _)
             .getTypeRepr()
     }
-
-    Type getParameterType(int j, TypePath path) {
-      exists(FunctionPosition pos | j = pos.asPosition() | result = this.getDeclaredType(pos, path))
-    }
-
-    Type getReturnType(TypePath path) {
-      exists(FunctionPosition pos | pos.isReturn() | result = this.getDeclaredType(pos, path))
-    }
   }
 
   class Call extends FunctionCallMatchingInput::Access {
@@ -450,21 +442,19 @@ private module Input3 implements InputSig3 {
   }
 
   bindingset[derefChainBorrow]
-  Type inferCallArgumentType(Call call, string derefChainBorrow, int i, TypePath path) {
-    exists(FunctionPosition pos |
-      i = pos.asPosition() and
-      result = call.(FunctionCallMatchingInput::Access).getInferredType(derefChainBorrow, pos, path)
-    )
+  Type inferCallArgumentType(Call call, string derefChainBorrow, int pos, TypePath path) {
+    result =
+      call.(FunctionCallMatchingInput::Access).getInferredArgumentType(derefChainBorrow, pos, path)
   }
 
-  Type inferCallArgumentType(AstNode n, TypePath path) {
+  Type inferCallArgumentTypeContextual(AstNode n, TypePath path) {
     exists(FunctionCallMatchingInput::Access call, FunctionPosition pos |
-      result = inferCallArgumentType(call, pos.asPosition(), n, _, _, path) and
+      result = inferCallArgumentTypeContextual(call, pos.asPosition(), n, _, _, path) and
       not call.(AssocFunctionResolution::AssocFunctionCall).hasReceiverAtPos(pos)
     )
     or
     exists(FunctionCallMatchingInput::Access a |
-      result = inferFunctionCallSelfArgumentType(a, n, DerefChain::nil(), path) and
+      result = inferFunctionCallSelfArgumentTypeContextual(a, n, DerefChain::nil(), path) and
       if a.(AssocFunctionResolution::AssocFunctionCall).hasReceiver()
       then not path.isEmpty()
       else any()
@@ -757,14 +747,13 @@ private class FunctionDeclaration extends Function {
   }
 
   pragma[nomagic]
-  Type getParameterType(ImplOrTraitItemNodeOption i, FunctionPosition pos, TypePath path) {
+  Type getParameterType(ImplOrTraitItemNodeOption i, int pos, TypePath path) {
     i = parent and
-    (
-      not pos.isReturn() and
-      result = getAssocFunctionTypeAt(this, i.asSome(), pos, path)
+    exists(FunctionPosition fpos | pos = fpos.asPosition() |
+      result = getAssocFunctionTypeAt(this, i.asSome(), fpos, path)
       or
       i.isNone() and
-      result = this.getParam(pos.asPosition()).getTypeRepr().(TypeMention).getTypeAt(path)
+      result = this.getParam(pos).getTypeRepr().(TypeMention).getTypeAt(path)
     )
   }
 
@@ -1039,17 +1028,14 @@ private class NonAssocCallExpr extends CallExpr {
 
   pragma[nomagic]
   Type getInferredType(FunctionPosition pos, TypePath path) {
-    pos.isTypeQualifier() and
-    result = getCallExprTypeQualifier(this, path, false)
-    or
     result = inferType(this.getNodeAt(pos), path)
   }
 }
 
 /**
- * Provides functionality related to context-based typing of calls.
+ * Provides functionality related to contextual typing of calls.
  */
-private module ContextTyping {
+private module ContextualTyping {
   /**
    * Holds if `f` mentions type parameter `tp` at some non-return position,
    * possibly via a constraint on another mentioned type parameter.
@@ -1094,7 +1080,7 @@ private module ContextTyping {
    * context in which the call appears, for example a call like
    * `Default::default()`.
    */
-  abstract class ContextTypedCallCand extends Expr {
+  abstract class ContextuallyTypedCallCand extends Expr {
     abstract Type getTypeArgument(TypeArgumentPosition apos, TypePath path);
 
     predicate hasTypeArgument(TypeArgumentPosition apos) {
@@ -2584,12 +2570,12 @@ private module AssocFunctionResolution {
 }
 
 /**
+ * TODO: rename/remove
+ *
  * A matching configuration for resolving types of function call expressions
  * like `foo.bar(baz)` and `Foo::bar(baz)`.
  */
-private module FunctionCallMatchingInput implements MatchingWithEnvironmentInputSig {
-  import FunctionPositionMatchingInput
-
+private module FunctionCallMatchingInput {
   private newtype TDeclaration =
     TFunctionDeclaration(ImplOrTraitItemNodeOption i, FunctionDeclaration f, boolean forIndexExpr) {
       f.isFor(i) and
@@ -2632,12 +2618,11 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
       result = f.getTypeParameter(i, ppos)
     }
 
-    Type getDeclaredType(FunctionPosition pos, TypePath path) {
-      result = f.getParameterType(i, pos, path)
-      or
+    Type getParameterType(int j, TypePath path) { result = f.getParameterType(i, j, path) }
+
+    Type getReturnType(TypePath path) {
       // index expression `x[i]` desugars to `*x.index(i)`, so we must account for
       // the implicit deref
-      pos.isReturn() and
       exists(TypePath path0 | result = f.getReturnType(i, path0) |
         forIndexExpr = true and
         path0.isCons(getRefTypeParameter(_), path)
@@ -2681,9 +2666,7 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
   }
 
   bindingset[derefChainBorrow]
-  additional predicate decodeDerefChainBorrow(
-    string derefChainBorrow, DerefChain derefChain, BorrowKind borrow
-  ) {
+  predicate decodeDerefChainBorrow(string derefChainBorrow, DerefChain derefChain, BorrowKind borrow) {
     exists(int i |
       i = derefChainBorrow.indexOf(";") and
       derefChain = derefChainBorrow.prefix(i) and
@@ -2701,11 +2684,11 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
 
   final class Access = AccessImpl;
 
-  abstract private class AccessImpl extends ContextTyping::ContextTypedCallCand {
+  abstract private class AccessImpl extends ContextualTyping::ContextuallyTypedCallCand {
     abstract AstNode getNodeAt(FunctionPosition pos);
 
     bindingset[derefChainBorrow]
-    abstract Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path);
+    abstract Type getInferredArgumentType(string derefChainBorrow, int pos, TypePath path);
 
     abstract Declaration getTarget(string derefChainBorrow);
 
@@ -2740,22 +2723,26 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
     }
 
     pragma[nomagic]
-    private Type getInferredSelfType(FunctionPosition pos, string derefChainBorrow, TypePath path) {
-      exists(DerefChain derefChain, BorrowKind borrow |
-        result = super.getSelfTypeAt(pos, derefChain, borrow, path) and
+    private Type getInferredSelfType(int pos, string derefChainBorrow, TypePath path) {
+      exists(FunctionPosition fpos, DerefChain derefChain, BorrowKind borrow |
+        result = super.getSelfTypeAt(fpos, derefChain, borrow, path) and
         derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow) and
-        super.hasReceiverAtPos(pos)
+        super.hasReceiverAtPos(fpos) and
+        pos = fpos.asPosition()
       )
     }
 
     pragma[nomagic]
-    private Type getInferredNonSelfType(FunctionPosition pos, TypePath path) {
-      not super.hasReceiverAtPos(pos) and
-      result = super.getTypeAt(pos, path)
+    private Type getInferredNonSelfType(int pos, TypePath path) {
+      exists(FunctionPosition fpos |
+        not super.hasReceiverAtPos(fpos) and
+        result = super.getTypeAt(fpos, path) and
+        pos = fpos.asPosition()
+      )
     }
 
     bindingset[derefChainBorrow]
-    override Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path) {
+    override Type getInferredArgumentType(string derefChainBorrow, int pos, TypePath path) {
       result = this.getInferredSelfType(pos, derefChainBorrow, path)
       or
       result = this.getInferredNonSelfType(pos, path)
@@ -2811,14 +2798,17 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
     }
 
     pragma[nomagic]
-    private Type getInferredType(FunctionPosition pos, TypePath path) {
-      result = super.getInferredType(pos, path)
+    private Type getInferredArgumentType(int pos, TypePath path) {
+      exists(FunctionPosition fpos |
+        result = super.getInferredType(fpos, path) and
+        pos = fpos.asPosition()
+      )
     }
 
     bindingset[derefChainBorrow]
-    override Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path) {
+    override Type getInferredArgumentType(string derefChainBorrow, int pos, TypePath path) {
       exists(derefChainBorrow) and
-      result = this.getInferredType(pos, path)
+      result = this.getInferredArgumentType(pos, path)
     }
 
     pragma[nomagic]
@@ -2852,13 +2842,13 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
 }
 
 pragma[nomagic]
-private Type inferCallArgumentType(
+private Type inferCallArgumentTypeContextual(
   FunctionCallMatchingInput::Access call, int pos, AstNode n, DerefChain derefChain,
   BorrowKind borrow, TypePath path
 ) {
   exists(string derefChainBorrow |
     FunctionCallMatchingInput::decodeDerefChainBorrow(derefChainBorrow, derefChain, borrow) and
-    result = M3::inferCallArgumentType(call, derefChainBorrow, pos, n, path)
+    result = M3::inferCallArgumentTypeContextual(call, derefChainBorrow, pos, n, path)
   )
 }
 
@@ -2870,12 +2860,12 @@ private Type inferCallArgumentType(
  * empty, at which point the inferred type can be applied back to `n`.
  */
 pragma[nomagic]
-private Type inferFunctionCallSelfArgumentType(
+private Type inferFunctionCallSelfArgumentTypeContextual(
   FunctionCallMatchingInput::Access call, AstNode n, DerefChain derefChain, TypePath path
 ) {
   exists(FunctionPosition pos, BorrowKind borrow, TypePath path0 |
     call.(AssocFunctionResolution::AssocFunctionCall).hasReceiverAtPos(pos) and
-    result = inferCallArgumentType(call, pos.asPosition(), n, derefChain, borrow, path0)
+    result = inferCallArgumentTypeContextual(call, pos.asPosition(), n, derefChain, borrow, path0)
   |
     borrow.isNoBorrow() and
     path = path0
@@ -2892,7 +2882,7 @@ private Type inferFunctionCallSelfArgumentType(
     DerefChain derefChain0, Type t0, TypePath path0, DerefImplItemNode impl, Type selfParamType,
     TypePath selfPath
   |
-    t0 = inferFunctionCallSelfArgumentType(call, n, derefChain0, path0) and
+    t0 = inferFunctionCallSelfArgumentTypeContextual(call, n, derefChain0, path0) and
     derefChain0.isCons(impl, derefChain) and
     selfParamType = impl.resolveSelfTypeAt(selfPath)
   |
@@ -2919,6 +2909,10 @@ abstract private class Constructor extends Addressable {
 
   abstract TypeRepr getParameterTypeRepr(int pos);
 
+  Type getParameterType(int pos, TypePath path) {
+    result = this.getParameterTypeRepr(pos).(TypeMention).getTypeAt(path)
+  }
+
   Type getReturnType(TypePath path) {
     result = TDataType(this.getTypeItem()) and
     path.isEmpty()
@@ -2933,10 +2927,6 @@ abstract private class Constructor extends Addressable {
     pos.isReturn() and
     result = this.getReturnType(path)
   }
-
-  Type getParameterType(int pos, TypePath path) {
-    result = this.getParameterTypeRepr(pos).(TypeMention).getTypeAt(path)
-  }
 }
 
 private class StructConstructor extends Constructor instanceof Struct {
@@ -2995,7 +2985,7 @@ private module ConstructionMatchingInput implements MatchingInputSig {
   }
 
   private class NonAssocCallAccess extends Access, NonAssocCallExpr,
-    ContextTyping::ContextTypedCallCand
+    ContextualTyping::ContextuallyTypedCallCand
   {
     NonAssocCallAccess() {
       this instanceof CallExprImpl::TupleStructExpr or
@@ -3130,7 +3120,11 @@ private module OperationMatchingInput implements MatchingInputSig {
 
     Type getDeclaredType(FunctionPosition pos, TypePath path) {
       exists(TypePath path0 |
-        result = super.getDeclaredType(pos, path0) and
+        result = super.getParameterType(pos.asPosition(), path0)
+        or
+        pos.isReturn() and
+        result = super.getReturnType(path0)
+      |
         if
           this.borrowsAt(pos)
           or