Rust: Avoid overlapping path resolution consistency checks

Author: hvitved

rust/ql/consistency-queries/PathResolutionConsistency.ql

@@ -20,8 +20,8 @@ class SourceLocatable extends Locatable {
   }
 }
 
-query predicate multipleMethodCallTargets(SourceLocatable a, SourceLocatable b) {
-  PathResolutionConsistency::multipleMethodCallTargets(a, b)
+query predicate multipleCallTargets(SourceLocatable a, SourceLocatable b) {
+  PathResolutionConsistency::multipleCallTargets(a, b)
 }
 
 query predicate multiplePathResolutions(SourceLocatable a, SourceLocatable b) {

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

@@ -17,11 +17,13 @@ query predicate multiplePathResolutions(Path p, ItemNode i) {
       not use.isGlob() and
       not use.hasUseTreeList()
     ).getPath() and
+  // avoid overlap with `multipleCallTargets` below
+  not p = any(CallExpr ce).getFunction().(PathExpr).getPath() and
   strictcount(resolvePath(p)) > 1
 }
 
 /** Holds if `call` has multiple static call targets including `target`. */
-query predicate multipleMethodCallTargets(MethodCallExpr call, Callable target) {
+query predicate multipleCallTargets(CallExprBase call, Callable target) {
   target = call.getStaticTarget() and
   strictcount(call.getStaticTarget()) > 1
 }
@@ -51,8 +53,8 @@ int getPathResolutionInconsistencyCounts(string type) {
   type = "Multiple path resolutions" and
   result = count(Path p | multiplePathResolutions(p, _) | p)
   or
-  type = "Multiple static method call targets" and
-  result = count(CallExprBase call | multipleMethodCallTargets(call, _) | call)
+  type = "Multiple static call targets" and
+  result = count(CallExprBase call | multipleCallTargets(call, _) | call)
   or
   type = "Multiple record fields" and
   result = count(FieldExpr fe | multipleStructFields(fe, _) | fe)

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

@@ -1,3 +1,16 @@
+multipleCallTargets
+| proc_macro.rs:16:12:16:16 | ...::to_tokens(...) | file://:0:0:0:0 | fn to_tokens |
+| proc_macro.rs:16:12:16:16 | ...::to_tokens(...) | file://:0:0:0:0 | fn to_tokens |
+| proc_macro.rs:16:12:16:16 | ...::to_tokens(...) | file://:0:0:0:0 | fn to_tokens |
+| proc_macro.rs:16:12:16:16 | ...::to_tokens(...) | file://:0:0:0:0 | fn to_tokens |
+| proc_macro.rs:26:10:26:12 | ...::to_tokens(...) | file://:0:0:0:0 | fn to_tokens |
+| proc_macro.rs:26:10:26:12 | ...::to_tokens(...) | file://:0:0:0:0 | fn to_tokens |
+| proc_macro.rs:26:10:26:12 | ...::to_tokens(...) | file://:0:0:0:0 | fn to_tokens |
+| proc_macro.rs:26:10:26:12 | ...::to_tokens(...) | file://:0:0:0:0 | fn to_tokens |
+| proc_macro.rs:27:10:27:16 | ...::to_tokens(...) | file://:0:0:0:0 | fn to_tokens |
+| proc_macro.rs:27:10:27:16 | ...::to_tokens(...) | file://:0:0:0:0 | fn to_tokens |
+| proc_macro.rs:27:10:27:16 | ...::to_tokens(...) | file://:0:0:0:0 | fn to_tokens |
+| proc_macro.rs:27:10:27:16 | ...::to_tokens(...) | file://:0:0:0:0 | fn to_tokens |
 multiplePathResolutions
 | macro_expansion.rs:1:5:1:14 | proc_macro | file://:0:0:0:0 | Crate(proc_macro@0.0.0) |
 | macro_expansion.rs:1:5:1:14 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |

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

@@ -0,0 +1,3 @@
+multipleCallTargets
+| main.rs:225:14:225:29 | ...::deref(...) | file://:0:0:0:0 | fn deref |
+| main.rs:225:14:225:29 | ...::deref(...) | file://:0:0:0:0 | fn deref |

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

@@ -1,15 +1,15 @@
-multiplePathResolutions
-| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
-| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from |
+multipleCallTargets
+| main.rs:532:10:532:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:532:10:532:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:532:10:532:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:532:10:532:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:532:10:532:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:532:10:532:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:532:10:532:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:538:10:538:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:538:10:538:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:538:10:538:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:538:10:538:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:538:10:538:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:538:10:538:21 | ...::from(...) | file://:0:0:0:0 | fn from |
+| main.rs:538:10:538:21 | ...::from(...) | file://:0:0:0:0 | fn from |