wip

Author: hvitved

rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll

@@ -18,7 +18,7 @@ module Input implements InputSig<Location, RustDataFlow> {
 
   abstract private class SourceSinkBase extends AstNode {
     /** Gets the associated call. */
-    abstract Call getCall();
+    abstract CallLikeExpr getCall();
 
     /** Holds if the associated call resolves to `path`. */
     final predicate callResolvesTo(string path) {

rust/ql/lib/codeql/rust/elements/Call.qll

@@ -3,29 +3,40 @@
  */
 
 private import rust
-private import internal.CallImpl
+private import internal.CallLikeExprImpl
 
-final class Call = Impl::Call;
-
-private predicate isClosureCall(CallExpr call) {
-  exists(Expr receiver | receiver = call.getFunction() |
-    // All calls to complex expressions and local variable accesses are lambda calls
-    receiver instanceof PathExpr implies receiver = any(Variable v).getAnAccess()
-  )
-}
+final class CallLikeExpr = Impl::CallLikeExpr;
 
 /**
  * Holds if `call` is guaranteed to be a method call, even if we cannot resolve
  * its target.
  */
-private predicate isGuaranteedMethodCall(Call call) {
+private predicate isGuaranteedMethodCall(CallLikeExpr call) {
   call instanceof MethodCallExpr
   or
   call.(Operation).isOverloaded(_, _, _)
   or
   call instanceof IndexExpr
 }
 
+/**
+ * A call expression.
+ */
+final class Call extends CallLikeExpr {
+  Call() {
+    forall(Addressable target | target = this.getStaticTarget() | target instanceof Callable)
+    or
+    isGuaranteedMethodCall(this)
+  }
+}
+
+private predicate isClosureCall(CallExpr call) {
+  exists(Expr receiver | receiver = call.getFunction() |
+    // All calls to complex expressions and local variable accesses are lambda calls
+    receiver instanceof PathExpr implies receiver = any(Variable v).getAnAccess()
+  )
+}
+
 /**
  * A call expression that targets a function or a closure.
  *

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

@@ -11,7 +11,7 @@ private import codeql.rust.elements.internal.generated.IndexExpr
  * be referenced directly.
  */
 module Impl {
-  private import codeql.rust.elements.internal.CallImpl::Impl as CallImpl
+  private import codeql.rust.elements.internal.CallLikeExprImpl::Impl as CallLikeExprImpl
 
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
@@ -21,7 +21,7 @@ module Impl {
    * list[42] = 1;
    * ```
    */
-  class IndexExpr extends Generated::IndexExpr, CallImpl::Call {
+  class IndexExpr extends Generated::IndexExpr, CallLikeExprImpl::CallLikeExpr {
     override string toStringImpl() {
       result =
         this.getBase().toAbbreviatedString() + "[" + this.getIndex().toAbbreviatedString() + "]"

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

@@ -12,7 +12,7 @@ private import codeql.rust.elements.internal.generated.MethodCallExpr
  * be referenced directly.
  */
 module Impl {
-  private import codeql.rust.elements.internal.CallImpl::Impl as CallImpl
+  private import codeql.rust.elements.internal.CallLikeExprImpl::Impl as CallLikeExprImpl
 
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
@@ -25,7 +25,7 @@ module Impl {
    * Consider using `MethodCall` instead, as that also includes calls to methods using
    * function call syntax (e.g., `Foo::method(x)`).
    */
-  class MethodCallExpr extends Generated::MethodCallExpr, CallImpl::Call {
+  class MethodCallExpr extends Generated::MethodCallExpr, CallLikeExprImpl::CallLikeExpr {
     private string toStringPart(int index) {
       index = 0 and
       result = this.getReceiver().toAbbreviatedString()

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

@@ -12,7 +12,7 @@ private import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  * be referenced directly.
  */
 module Impl {
-  private import codeql.rust.elements.internal.CallImpl::Impl as CallImpl
+  private import codeql.rust.elements.internal.CallLikeExprImpl::Impl as CallLikeExprImpl
 
   /**
    * Holds if the operator `op` with arity `arity` is overloaded to a trait with
@@ -102,7 +102,7 @@ module Impl {
   /**
    * An operation, for example `&&`, `+=`, `!` or `*`.
    */
-  abstract class Operation extends CallImpl::Call {
+  abstract class Operation extends CallLikeExprImpl::CallLikeExpr {
     /** Gets the operator name of this operation, if it exists. */
     abstract string getOperatorName();
 

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

@@ -14,7 +14,6 @@ private import codeql.typeinference.internal.TypeInference
 private import codeql.rust.frameworks.stdlib.Stdlib
 private import codeql.rust.frameworks.stdlib.Builtins as Builtins
 private import codeql.rust.elements.Call
-private import codeql.rust.elements.internal.CallImpl::Impl as CallImpl
 private import codeql.rust.elements.internal.CallExprImpl::Impl as CallExprImpl
 
 class Type = T::Type;
@@ -1363,7 +1362,7 @@ private module MethodResolution {
    *
    * [1]: https://doc.rust-lang.org/std/ops/trait.Index.html
    */
-  abstract class MethodCall extends Call {
+  abstract class MethodCall extends CallLikeExpr {
     abstract predicate hasNameAndArity(string name, int arity);
 
     abstract Expr getArg(ArgumentPosition pos);
@@ -3484,7 +3483,7 @@ private module Cached {
 
   /** Gets an item (function or tuple struct/variant) that `call` resolves to, if any. */
   cached
-  Addressable resolveCallTarget(Call call) {
+  Addressable resolveCallTarget(CallLikeExpr call) {
     result = call.(MethodResolution::MethodCall).resolveCallTarget(_, _, _)
     or
     result = call.(NonMethodResolution::NonMethodCall).resolveCallTarget()