Restrict resolution

Author: hvitved

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

@@ -814,6 +814,7 @@ module RustDataFlow implements InputSig<Location> {
       // A path expression, that resolves to a function, evaluates to a function
       // pointer. Except if the path occurs directly in a call, then it's just a
       // call to the function and not a function being passed as data.
+      e.(PathExpr).hasResolvedPath() and
       resolvePath(e.(PathExpr).getPath()) = c.asCfgScope() and
       not any(CallExpr call).getFunction() = e
     )

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

@@ -146,6 +146,7 @@ private module StepsInput implements Impl::Private::StepsInputSig {
 
   /** Get the callable that `expr` refers to. */
   private Callable getCallable(Expr expr) {
+    expr.(PathExpr).hasResolvedPath() and
     result = resolvePath(expr.(PathExpr).getPath()).(Function)
     or
     result = expr.(ClosureExpr)

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

@@ -16,7 +16,10 @@ module Impl {
   private import codeql.rust.internal.PathResolution as PathResolution
 
   pragma[nomagic]
-  Path getFunctionPath(CallExpr ce) { result = ce.getFunction().(PathExpr).getPath() }
+  Path getFunctionPath(CallExpr ce) {
+    ce.getFunction().(PathExpr).hasResolvedPath() and
+    result = ce.getFunction().(PathExpr).getPath()
+  }
 
   pragma[nomagic]
   PathResolution::ItemNode getResolvedFunction(CallExpr ce) {

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

@@ -36,6 +36,7 @@ module Impl {
 
     pragma[nomagic]
     private PathResolution::ItemNode getResolvedPath(string name) {
+      this.hasResolvedPath() and
       result = PathResolution::resolvePath(this.getPath()) and
       exists(this.getFieldExpr(name))
     }

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

@@ -29,6 +29,7 @@ module Impl {
 
     pragma[nomagic]
     private PathResolution::ItemNode getResolvedPath(string name) {
+      this.hasResolvedPath() and
       result = PathResolution::resolvePath(this.getPath()) and
       name = this.getStructPatFieldList().getAField().getFieldName()
     }

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

@@ -30,14 +30,18 @@ module Impl {
 
     pragma[nomagic]
     private PathResolution::ItemNode getResolvedPath(int pos) {
+      this.hasResolvedPath() and
       result = PathResolution::resolvePath(this.getPath()) and
       exists(this.getField(pragma[only_bind_into](pos)))
     }
 
     /**
      * Gets the struct matched by this pattern.
      */
-    Struct getStruct() { result = PathResolution::resolvePath(this.getPath()) }
+    Struct getStruct() {
+      this.hasResolvedPath() and
+      result = PathResolution::resolvePath(this.getPath())
+    }
 
     /** Gets the tuple field that matches the `pos`th pattern of this pattern. */
     pragma[nomagic]

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

@@ -3215,6 +3215,7 @@ private module Cached {
   /** Gets an item (function or tuple struct/variant) that `call` resolves to, if any. */
   cached
   Addressable resolveCallTarget(Call call) {
+    call.(Resolvable).hasResolvedPath() and
     result = call.(MethodResolution::MethodCall).resolveCallTarget(_, _)
     or
     result = call.(NonMethodResolution::NonMethodCall).resolveCallTarget()