wip

Author: hvitved

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

@@ -240,9 +240,15 @@ private module Input3 implements InputSig3 {
 
   class AstNode = Rust::AstNode;
 
-  class Expr = Rust::Expr;
+  final class Expr = ExprImpl;
 
-  class Cast extends CastExpr {
+  abstract private class ExprImpl extends AstNode { }
+
+  private class ExprExpr extends ExprImpl, Rust::Expr { }
+
+  private class ArgListExpr extends ExprImpl, ArgList { }
+
+  class Cast extends Expr, CastExpr {
     TypeMention getType() { result = this.getTypeRepr() }
   }
 
@@ -258,11 +264,15 @@ private module Input3 implements InputSig3 {
     AstNode getBody() { result = this.getExpr() }
   }
 
-  class ConditionalExpr extends IfExpr {
+  class ConditionalExpr extends Expr instanceof IfExpr {
+    Expr getCondition() { result = super.getCondition() }
+
     Expr getThen() { result = super.getThen() }
+
+    Expr getElse() { result = super.getElse() }
   }
 
-  class BinaryExpr extends Rust::BinaryExpr {
+  class BinaryExpr extends Expr, Rust::BinaryExpr {
     Expr getLeftOperand() { result = super.getLhs() }
 
     Expr getRightOperand() { result = super.getRhs() }
@@ -276,7 +286,9 @@ private module Input3 implements InputSig3 {
 
   class AssignExpr extends Assignment, Rust::AssignmentExpr { }
 
-  class ParenExpr = Rust::ParenExpr;
+  class ParenExpr extends Expr instanceof Rust::ParenExpr {
+    Expr getExpr() { result = super.getExpr() }
+  }
 
   final class Declaration = DeclarationImpl;
 
@@ -389,7 +401,7 @@ private module Input3 implements InputSig3 {
     override TypeMention getType() { result = TupleField.super.getTypeRepr() }
   }
 
-  class FieldAccess extends FieldExpr {
+  class FieldAccess extends Expr, FieldExpr {
     Expr getReceiver() { result = this.getContainer() }
 
     Field getField() {
@@ -588,15 +600,11 @@ private module Input3 implements InputSig3 {
 
     abstract Type getTypeArgument(int pos, TypePath path);
 
-    abstract AstNode getArgument(int i);
-
-    Parameterizable getTargetForTypeQualifierMatching() {
-      result = CallExprImpl::getResolvedFunction(this)
-      or
-      result = this.(Construction).getTarget()
-    }
+    abstract Expr getArgument(int i);
 
     abstract Parameterizable getTarget(string derefChainBorrow);
+
+    abstract Parameterizable getATargetForTypeQualifierMatching();
   }
 
   private class AssocFunctionCall extends InvocationImpl instanceof AssocFunctionResolution::AssocFunctionCall
@@ -613,7 +621,7 @@ private module Input3 implements InputSig3 {
       result = getCallExprTypeArgument(this, pos, path)
     }
 
-    override AstNode getArgument(int i) {
+    override Expr getArgument(int i) {
       exists(FunctionPosition pos |
         i = pos.asPosition() and
         result = super.getNodeAt(pos)
@@ -645,6 +653,10 @@ private module Input3 implements InputSig3 {
         result = super.resolveCallTarget(_, _, derefChain, borrow) // mutual recursion; resolving method calls requires resolving types and vice versa
       )
     }
+
+    override Parameterizable getATargetForTypeQualifierMatching() {
+      result = CallExprImpl::getResolvedFunction(this)
+    }
   }
 
   private class NonAssocFunctionCall extends InvocationImpl instanceof NonAssocCallExpr,
@@ -657,7 +669,7 @@ private module Input3 implements InputSig3 {
       result = NonAssocCallExpr.super.getTypeArgument(pos, path)
     }
 
-    override AstNode getArgument(int i) {
+    override Expr getArgument(int i) {
       exists(FunctionPosition pos |
         i = pos.asPosition() and
         result = super.getNodeAt(pos)
@@ -671,6 +683,10 @@ private module Input3 implements InputSig3 {
       result = this.getTarget() and
       derefChainBorrow = noDerefChainBorrow()
     }
+
+    override Parameterizable getATargetForTypeQualifierMatching() {
+      none() // non-assoc function calls cannot have type qualifiers
+    }
   }
 
   abstract private class Construction extends InvocationImpl {
@@ -680,6 +696,8 @@ private module Input3 implements InputSig3 {
       result = this.getTarget() and
       derefChainBorrow = noDerefChainBorrow()
     }
+
+    override Parameterizable getATargetForTypeQualifierMatching() { result = this.getTarget() }
   }
 
   private class NonAssocCallConstruction extends Construction, NonAssocCallExpr {
@@ -697,7 +715,7 @@ private module Input3 implements InputSig3 {
       none()
     }
 
-    override AstNode getArgument(int i) {
+    override Expr getArgument(int i) {
       exists(FunctionPosition pos |
         i = pos.asPosition() and
         result = NonAssocCallExpr.super.getNodeAt(pos)
@@ -721,7 +739,7 @@ private module Input3 implements InputSig3 {
   }
 
   private class StructExprConstruction extends StructConstruction, StructExpr {
-    override AstNode getArgument(int i) {
+    override Expr getArgument(int i) {
       result =
         this.getFieldExpr(pragma[only_bind_into](this.getNthStructField(i).getName().getText()))
             .getExpr()
@@ -732,7 +750,7 @@ private module Input3 implements InputSig3 {
   private class PathExprConstruction extends StructConstruction, PathExpr {
     PathExprConstruction() { not exists(CallExpr ce | this = ce.getFunction()) }
 
-    override AstNode getArgument(int i) { none() }
+    override Expr getArgument(int i) { none() }
   }
 
   pragma[nomagic]
@@ -764,32 +782,33 @@ private module Input3 implements InputSig3 {
 
   pragma[nomagic]
   private Type inferInvocationArgumentTypeContextualDefault(
-    Invocation invocation, int pos, AstNode n, DerefChain derefChain, BorrowKind borrow,
+    Invocation invocation, int pos, Expr arg, DerefChain derefChain, BorrowKind borrow,
     TypePath path
   ) {
     exists(string derefChainBorrow |
       decodeDerefChainBorrow(derefChainBorrow, derefChain, borrow) and
       result =
-        M3::inferInvocationArgumentTypeContextualDefault(invocation, derefChainBorrow, pos, n, path)
+        M3::inferInvocationArgumentTypeContextualDefault(invocation, derefChainBorrow, pos, arg,
+          path)
     )
   }
 
   /**
-   * Gets the type of `n` at `path` after applying `derefChain`, where `n` is the
-   * `self` argument of a method call.
+   * Gets the type of `receiver` at `path` after applying `derefChain`, where
+   * `receiver` is the `self` argument of a method call.
    *
    * The predicate recursively pops the head of `derefChain` until it becomes
-   * empty, at which point the inferred type can be applied back to `n`.
+   * empty, at which point the inferred type can be applied back to `receiver`.
    */
   pragma[nomagic]
   private Type inferInvocationSelfArgumentTypeContextual(
-    Invocation invocation, AstNode n, DerefChain derefChain, TypePath path
+    Invocation invocation, Expr receiver, DerefChain derefChain, TypePath path
   ) {
     exists(FunctionPosition pos, BorrowKind borrow, TypePath path0 |
       invocation.(AssocFunctionResolution::AssocFunctionCall).hasReceiverAtPos(pos) and
       result =
-        inferInvocationArgumentTypeContextualDefault(invocation, pos.asPosition(), n, derefChain,
-          borrow, path0)
+        inferInvocationArgumentTypeContextualDefault(invocation, pos.asPosition(), receiver,
+          derefChain, borrow, path0)
     |
       borrow.isNoBorrow() and
       path = path0
@@ -806,7 +825,7 @@ private module Input3 implements InputSig3 {
       DerefChain derefChain0, Type t0, TypePath path0, DerefImplItemNode impl, Type selfParamType,
       TypePath selfPath
     |
-      t0 = inferInvocationSelfArgumentTypeContextual(invocation, n, derefChain0, path0) and
+      t0 = inferInvocationSelfArgumentTypeContextual(invocation, receiver, derefChain0, path0) and
       derefChain0.isCons(impl, derefChain) and
       selfParamType = impl.resolveSelfTypeAt(selfPath)
     |
@@ -823,14 +842,14 @@ private module Input3 implements InputSig3 {
     )
   }
 
-  Type inferInvocationArgumentTypeContextual(AstNode n, TypePath path) {
+  Type inferInvocationArgumentTypeContextual(Expr arg, TypePath path) {
     exists(Invocation invocation, FunctionPosition pos, TypePath path0 |
       result =
-        inferInvocationArgumentTypeContextualDefault(invocation, pos.asPosition(), n, _, _, path0) and
+        inferInvocationArgumentTypeContextualDefault(invocation, pos.asPosition(), arg, _, _, path0) and
       not invocation.(AssocFunctionResolution::AssocFunctionCall).hasReceiverAtPos(pos)
       or
       pos.asPosition() = 0 and
-      result = inferInvocationSelfArgumentTypeContextual(invocation, n, DerefChain::nil(), path0) and
+      result = inferInvocationSelfArgumentTypeContextual(invocation, arg, DerefChain::nil(), path0) and
       not path0.isEmpty()
     |
       if invocation.(AssocFunctionResolution::OperationAssocFunctionCall).implicitBorrowAt(pos, _)
@@ -865,10 +884,8 @@ private module Input3 implements InputSig3 {
 
   class Closure extends Expr, Callable instanceof Rust::ClosureExpr { }
 
-  class ClosureParameterPseudoType = T::ClosureParameterPseudoType;
-
-  ClosureParameterPseudoType getClosureParameterPseudoType(Parameter p) {
-    result = TClosureParameterPseudoType(p)
+  class ClosureParameterPseudoType extends T::ClosureParameterPseudoType {
+    Parameter getParameter() { result = this.getParam() }
   }
 
   /**