Rust: Include more calls in DB quality metrics

Author: hvitved

rust/ql/consistency-queries/PathResolutionConsistency.ql

@@ -15,8 +15,8 @@ class SourceLocatable extends Locatable {
   SourceLocatable() { this.fromSource() }
 }
 
-query predicate multipleCallTargets(SourceLocatable a) {
-  PathResolutionConsistency::multipleCallTargets(a, _)
+query predicate multipleResolvedTargets(SourceLocatable a) {
+  PathResolutionConsistency::multipleResolvedTargets(a, _)
 }
 
 query predicate multiplePathResolutions(SourceLocatable a) {

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

@@ -24,17 +24,10 @@ query predicate multiplePathResolutions(Path p, ItemNode i) {
   strictcount(ItemNode i0 | i0 = resolvePath(p) and not i0 instanceof Crate) > 1
 }
 
-// TODO: Take other calls into account
-abstract private class CallExprBase extends ArgsExpr { }
-
-private class CallExprCallExprBase extends CallExpr, CallExprBase { }
-
-private class MethodCallExprCallExprBase extends MethodCallExpr, CallExprBase { }
-
-/** Holds if `call` has multiple static call targets including `target`. */
-query predicate multipleCallTargets(CallExprBase call, Callable target) {
-  target = call.getResolvedTarget() and
-  strictcount(call.getResolvedTarget()) > 1
+/** Holds if `ae` has multiple resolved targets including `target`. */
+query predicate multipleResolvedTargets(ArgsExpr ae, Addressable target) {
+  target = ae.getResolvedTarget() and
+  strictcount(ae.getResolvedTarget()) > 1
 }
 
 /** Holds if `fe` resolves to multiple record fields including `field`. */
@@ -62,8 +55,8 @@ int getPathResolutionInconsistencyCounts(string type) {
   type = "Multiple path resolutions" and
   result = count(Path p | multiplePathResolutions(p, _) | p)
   or
-  type = "Multiple static call targets" and
-  result = count(CallExprBase call | multipleCallTargets(call, _) | call)
+  type = "Multiple resolved targets" and
+  result = count(ArgsExpr ae | multipleResolvedTargets(ae, _) | ae)
   or
   type = "Multiple record fields" and
   result = count(FieldExpr fe | multipleStructFields(fe, _) | fe)

rust/ql/src/queries/telemetry/DatabaseQuality.qll

@@ -19,25 +19,25 @@ private class RelevantFile extends File {
 }
 
 module CallTargetStats implements StatsSig {
-  // TODO: Take other calls into account
-  abstract private class CallExprBase extends ArgsExpr { }
-
-  private class CallExprCallExprBase extends CallExpr, CallExprBase { }
-
-  private class MethodCallExprCallExprBase extends MethodCallExpr, CallExprBase { }
-
-  int getNumberOfOk() {
-    result =
-      count(CallExprBase c | c.getFile() instanceof RelevantFile and exists(c.getResolvedTarget()))
+  /**
+   * A call-like expression that is relevant for call target statistics.
+   *
+   * Note that this also includes tuple struct instantiations and tuple
+   * enum variant instantiations.
+   */
+  private class RelevantArgsExpr extends ArgsExpr {
+    RelevantArgsExpr() {
+      this.getFile() instanceof RelevantFile and
+      not this instanceof ClosureCallExpr and
+      not this = any(Operation o | not o.isOverloaded(_, _, _))
+    }
   }
 
-  additional predicate isNotOkCall(CallExprBase c) {
-    c.getFile() instanceof RelevantFile and
-    not exists(c.getResolvedTarget()) and
-    not c instanceof ClosureCallExpr
-  }
+  int getNumberOfOk() { result = count(RelevantArgsExpr e | exists(e.getResolvedTarget())) }
+
+  additional predicate isNotOkCall(RelevantArgsExpr e) { not exists(e.getResolvedTarget()) }
 
-  int getNumberOfNotOk() { result = count(CallExprBase c | isNotOkCall(c)) }
+  int getNumberOfNotOk() { result = count(RelevantArgsExpr e | isNotOkCall(e)) }
 
   string getOkText() { result = "calls with call target" }
 

rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/PathResolutionConsistency.expected

@@ -1,2 +1,2 @@
-multipleCallTargets
+multipleResolvedTargets
 | proc_macro.rs:44:27:44:30 | ...::to_tokens(...) |

rust/ql/test/library-tests/dataflow/sources/net/CONSISTENCY/PathResolutionConsistency.expected

@@ -1,4 +1,4 @@
-multipleCallTargets
+multipleResolvedTargets
 | test.rs:59:62:59:77 | ...::from(...) |
 | test.rs:66:58:66:73 | ...::from(...) |
 | test.rs:389:30:389:67 | pinned.poll_read(...) |

rust/ql/test/library-tests/dataflow/strings/CONSISTENCY/PathResolutionConsistency.expected

@@ -1,2 +1,2 @@
-multipleCallTargets
+multipleResolvedTargets
 | main.rs:52:14:52:29 | ...::from(...) |

rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected

@@ -1,4 +1,4 @@
-multipleCallTargets
+multipleResolvedTargets
 | main.rs:126:9:126:11 | f(...) |
 | main.rs:366:9:368:16 | ...::f(...) |
 | main.rs:369:9:371:16 | ...::f(...) |

rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected

@@ -1,13 +1,34 @@
-multipleCallTargets
+multipleResolvedTargets
+| blanket_impl.rs:33:13:33:17 | * ... |
 | dereference.rs:69:15:69:24 | e1.deref() |
+| dereference.rs:73:15:73:17 | * ... |
+| dereference.rs:77:16:77:18 | * ... |
 | dereference.rs:182:17:182:26 | ... .foo() |
 | dereference.rs:183:17:183:23 | S.foo() |
 | dereference.rs:184:17:184:30 | ... .foo() |
 | dereference.rs:186:17:186:25 | S.bar(...) |
 | dereference.rs:187:17:187:29 | S.bar(...) |
+| dyn_type.rs:65:20:65:23 | * ... |
+| dyn_type.rs:69:21:69:24 | * ... |
+| dyn_type.rs:90:10:90:13 | * ... |
+| invalid/main.rs:69:13:69:17 | * ... |
+| invalid/main.rs:76:13:76:17 | * ... |
+| main.rs:1077:14:1077:18 | * ... |
+| main.rs:1159:26:1159:30 | * ... |
+| main.rs:1504:14:1504:21 | * ... |
+| main.rs:1504:16:1504:20 | * ... |
+| main.rs:1509:14:1509:18 | * ... |
+| main.rs:1540:27:1540:29 | * ... |
+| main.rs:1654:17:1654:24 | * ... |
+| main.rs:1654:18:1654:24 | * ... |
+| main.rs:1792:17:1792:21 | * ... |
+| main.rs:1807:28:1807:32 | * ... |
+| main.rs:2440:13:2440:18 | * ... |
 | main.rs:2634:13:2634:31 | ...::from(...) |
 | main.rs:2635:13:2635:31 | ...::from(...) |
 | main.rs:2636:13:2636:31 | ...::from(...) |
 | main.rs:2642:13:2642:31 | ...::from(...) |
 | main.rs:2643:13:2643:31 | ...::from(...) |
 | main.rs:2644:13:2644:31 | ...::from(...) |
+| pattern_matching.rs:273:13:273:27 | * ... |
+| pattern_matching.rs:273:14:273:27 | * ... |

rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected

@@ -1,3 +1,17 @@
-multipleCallTargets
+multipleResolvedTargets
+| main.rs:16:15:16:16 | * ... |
 | main.rs:91:19:91:40 | ...::from(...) |
 | main.rs:113:19:113:40 | ...::from(...) |
+| main.rs:507:5:507:10 | * ... |
+| main.rs:512:5:512:6 | * ... |
+| main.rs:513:9:513:10 | * ... |
+| main.rs:514:9:514:10 | * ... |
+| main.rs:519:5:519:6 | * ... |
+| main.rs:520:9:520:10 | * ... |
+| main.rs:521:9:521:10 | * ... |
+| main.rs:522:5:522:6 | * ... |
+| main.rs:530:5:530:6 | * ... |
+| main.rs:542:5:542:7 | * ... |
+| main.rs:542:6:542:7 | * ... |
+| main.rs:552:5:552:6 | * ... |
+| main.rs:699:9:699:13 | * ... |

rust/ql/test/query-tests/diagnostics/CONSISTENCY/PathResolutionConsistency.expected

@@ -1,2 +1,2 @@
-multipleCallTargets
+multipleResolvedTargets
 | my_struct.rs:25:19:25:37 | ...::from(...) |