Merge pull request github#18140 from paldepind/rust-get-target

Rust: Add `getStaticTarget` to `CallExprBase`

Author: paldepind

rust/ql/.generated.list

@@ -538,20 +538,9 @@ module RustDataFlow implements InputSig<Location> {
 
   final class ReturnKind = ReturnKindAlias;
 
-  pragma[nomagic]
-  private Resolvable getCallResolvable(CallExprBase call) {
-    result = call.(MethodCallExpr)
-    or
-    result = call.(CallExpr).getFunction().(PathExpr).getPath()
-  }
-
   /** Gets a viable implementation of the target of the given `Call`. */
   DataFlowCallable viableCallable(DataFlowCall call) {
-    exists(Resolvable r, string path, CrateOriginOption crate |
-      hasExtendedCanonicalPath(result.asCfgScope(), crate, path) and
-      r = getCallResolvable(call.asCallBaseExprCfgNode().getExpr()) and
-      resolveExtendedCanonicalPath(r, crate, path)
-    )
+    result.asCfgScope() = call.asCallBaseExprCfgNode().getCallExprBase().getStaticTarget()
   }
 
   /**

rust/ql/.gitattributes

@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `CallExprBase`.
  *
@@ -12,8 +11,27 @@ private import codeql.rust.elements.internal.generated.CallExprBase
  * be referenced directly.
  */
 module Impl {
+  private import codeql.rust.elements.internal.CallableImpl::Impl
+  private import codeql.rust.elements.internal.MethodCallExprImpl::Impl
+  private import codeql.rust.elements.internal.CallExprImpl::Impl
+  private import codeql.rust.elements.internal.PathExprImpl::Impl
+
+  pragma[nomagic]
+  private Resolvable getCallResolvable(CallExprBase call) {
+    result = call.(MethodCallExpr)
+    or
+    result = call.(CallExpr).getFunction().(PathExpr).getPath()
+  }
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
    */
-  class CallExprBase extends Generated::CallExprBase { }
+  class CallExprBase extends Generated::CallExprBase {
+    /**
+     * Gets the target callable of this call, if a unique such target can
+     * be statically resolved.
+     */
+    Callable getStaticTarget() { getCallResolvable(this).resolvesAsItem(result) }
+  }
 }

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

@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Resolvable`.
  *
@@ -12,8 +11,25 @@ private import codeql.rust.elements.internal.generated.Resolvable
  * be referenced directly.
  */
 module Impl {
+  private import codeql.rust.elements.internal.ItemImpl::Impl
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * Either a `Path`, or a `MethodCallExpr`.
    */
-  class Resolvable extends Generated::Resolvable { }
+  class Resolvable extends Generated::Resolvable {
+    /**
+     * Holds if this resolvable and the item `i` resolves to the same canonical
+     * path in the same crate
+     */
+    pragma[nomagic]
+    predicate resolvesAsItem(Item i) {
+      this.getResolvedPath() = i.getExtendedCanonicalPath() and
+      (
+        this.getResolvedCrateOrigin() = i.getCrateOrigin()
+        or
+        not this.hasResolvedCrateOrigin() and not i.hasCrateOrigin()
+      )
+    }
+  }
 }