wip

Author: hvitved

rust/ql/lib/codeql/rust/elements/internal/ArgsExprImpl.qll

@@ -19,14 +19,6 @@ module Impl {
     /** Gets the number of positional arguments of this expression. */
     int getNumberOfArguments() { result = count(Expr arg | arg = this.getArgument(_)) }
 
-    /**
-     * Gets the receiver of this expression, if any.
-     *
-     * This is either an actual receiver of a method call, the first operand of an operation,
-     * or the base expression of an index expression.
-     */
-    Expr getReceiver() { none() }
-
     /** Gets the resolved target (function or tuple struct/variant) of this call, if any. */
     Addressable getResolvedTarget() { result = TypeInference::resolveCallTarget(this) }
   }

rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll

@@ -3,6 +3,7 @@ private import rust
 module Impl {
   private import codeql.rust.internal.TypeInference as TypeInference
   private import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+  private import codeql.rust.elements.internal.ArgsExprImpl::Impl as ArgsExprImpl
 
   /**
    * A call.
@@ -14,19 +15,10 @@ module Impl {
    * - an `Operation` that targets an overloadable opeator, or
    * - an `IndexExpr`.
    */
-  abstract class Call extends ExprImpl::Expr {
-    /** Gets the `i`th positional argument of this call, if any. */
-    Expr getArgument(int i) { none() }
-
+  abstract class Call extends ArgsExprImpl::ArgsExpr {
     // todo: remove once internal query has been updated
     Expr getArg(int i) { result = this.getArgument(i) }
 
-    /** Gets a positional argument of this call, if any. */
-    Expr getAnArgument() { result = this.getArgument(_) }
-
-    /** Gets the number of positional arguments of this call. */
-    int getNumberOfArguments() { result = count(Expr arg | arg = this.getArgument(_)) }
-
     // todo: remove once internal query has been updated
     int getNumberOfArgs() { result = this.getNumberOfArguments() }
 

rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll

@@ -32,10 +32,4 @@ module Impl {
 
     override Expr getReceiver() { result = this.getBase() }
   }
-
-  private class IndexArgsExpr extends ArgsExprImpl::ArgsExpr instanceof IndexExpr {
-    override Expr getArgument(int i) { result = IndexExpr.super.getArgument(i) }
-
-    override Expr getReceiver() { result = IndexExpr.super.getReceiver() }
-  }
 }

rust/ql/lib/codeql/rust/elements/internal/MethodCallExprImpl.qll

@@ -49,10 +49,4 @@ module Impl {
 
     override Expr getReceiver() { result = Generated::MethodCallExpr.super.getReceiver() }
   }
-
-  private class MethodCallArgsExpr extends ArgsExprImpl::ArgsExpr instanceof MethodCallExpr {
-    override Expr getArgument(int i) { result = MethodCallExpr.super.getArgument(i) }
-
-    override Expr getReceiver() { result = MethodCallExpr.super.getReceiver() }
-  }
 }

rust/ql/lib/codeql/rust/elements/internal/OperationImpl.qll

@@ -115,9 +115,10 @@ module Impl {
     /** Gets the `n`th operand of this operation, if any. */
     abstract Expr getOperand(int n);
 
-    override Expr getArgument(int i) { result = this.getOperand(i + 1) and i >= 0 }
-
-    override Expr getReceiver() { result = this.getOperand(0) }
+    override Expr getArgument(int i) {
+      not this.isOverloaded(_, _, _) and
+      result = this.getOperand(i)
+    }
 
     /**
      * Gets the number of operands of this operation.
@@ -142,8 +143,8 @@ module Impl {
   private class CallOperation extends CallImpl::Call instanceof Operation {
     CallOperation() { super.isOverloaded(_, _, _) }
 
-    override Expr getArgument(int i) { result = Operation.super.getArgument(i) }
+    override Expr getArgument(int i) { result = super.getOperand(i + 1) and i >= 0 }
 
-    override Expr getReceiver() { result = Operation.super.getReceiver() }
+    override Expr getReceiver() { result = super.getOperand(0) }
   }
 }

rust/ql/lib/codeql/rust/elements/internal/ParenArgsExprImpl.qll

@@ -15,6 +15,7 @@ module Impl {
   private import codeql.rust.elements.internal.CallImpl::Impl as CallImpl
   private import codeql.rust.elements.internal.ArgsExprImpl::Impl as ArgsExprImpl
   private import codeql.rust.internal.PathResolution as PathResolution
+  private import codeql.rust.internal.TypeInference as TypeInference
 
   pragma[nomagic]
   Path getBasePath(ParenArgsExpr pae) { result = pae.getBase().(PathExpr).getPath() }
@@ -69,10 +70,15 @@ module Impl {
 
   private class ParenArgsCallExpr extends CallImpl::Call instanceof ParenArgsExpr {
     ParenArgsCallExpr() {
-      forall(Addressable target | target = super.getResolvedTarget() | target instanceof Callable)
+      forall(Addressable target |
+        // Cannot use `this.getResolvedTarget()` as that results in non-monotonic recursion
+        target = TypeInference::resolveCallTarget(this)
+      |
+        target instanceof Callable
+      )
     }
 
-    private predicate isMethodCall() { super.getResolvedTarget() instanceof Method }
+    private predicate isMethodCall() { this.getResolvedTarget() instanceof Method }
 
     override Expr getArgument(int i) {
       if this.isMethodCall()

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

@@ -1361,7 +1361,7 @@ private module MethodResolution {
    *
    * [1]: https://doc.rust-lang.org/std/ops/trait.Index.html
    */
-  abstract class MethodCall extends ArgsExpr {
+  abstract class MethodCall extends Expr {
     abstract predicate hasNameAndArity(string name, int arity);
 
     abstract Expr getArg(ArgumentPosition pos);
@@ -3483,7 +3483,7 @@ private module Cached {
 
   /** Gets an item (function or tuple struct/variant) that `call` resolves to, if any. */
   cached
-  Addressable resolveCallTarget(ArgsExpr call) {
+  Addressable resolveCallTarget(Expr call) {
     result = call.(MethodResolution::MethodCall).resolveCallTarget(_, _, _)
     or
     result = call.(NonMethodResolution::NonMethodCall).resolveCallTarget()