wip

Author: hvitved

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

@@ -1878,6 +1878,37 @@ private module AssocFunctionResolution {
           selfPosAdj, derefChain, borrow), impl)
     }
 
+    pragma[nomagic]
+    private predicate hasNoInherentTargetCheck(
+      FunctionPosition selfPosAdj, DerefChain derefChain, BorrowKind borrow
+    ) {
+      MkAssocFunctionCallCand(this, selfPosAdj, derefChain, borrow)
+          .(AssocFunctionCallCand)
+          .hasNoInherentTargetCheck()
+    }
+
+    pragma[nomagic]
+    private predicate hasNoInherentTargetTypeQualifierCheck() {
+      exists(FunctionPosition typeQualifierPos |
+        typeQualifierPos.isTypeQualifier() and
+        this.hasNoInherentTargetCheck(typeQualifierPos, DerefChain::nil(), TNoBorrowKind())
+      )
+    }
+
+    pragma[nomagic]
+    predicate hasNoInherentTarget(
+      FunctionPosition selfPosAdj, DerefChain derefChain, BorrowKind borrow
+    ) {
+      this.hasNoInherentTargetCheck(selfPosAdj, derefChain, borrow) and
+      if exists(getNonTypeParameterTypeQualifier(this)) and not selfPosAdj.isTypeQualifier()
+      then
+        // If this call is of the form `Foo::bar(x)` and we are resolving with respect to the type
+        // of `x`, then we additionally need to check that the type qualifier does not give rise
+        // to an inherent target
+        this.hasNoInherentTargetTypeQualifierCheck()
+      else any()
+    }
+
     /**
      * Same as `getSelfTypeAt`, but excludes pseudo types `!` and `unknown`.
      */
@@ -2480,19 +2511,7 @@ private module AssocFunctionResolution {
     predicate hasNoInherentTarget() {
       afc_.hasTrait()
       or
-      this.hasNoInherentTargetCheck() and
-      if exists(getNonTypeParameterTypeQualifier(afc_)) and not selfPosAdj_.isTypeQualifier()
-      then
-        // If this call is of the form `Foo::bar(x)` and we are resolving with respect to the type
-        // of `x`, then we additionally need to check that the type qualifier does not give rise
-        // to an inherent target
-        exists(FunctionPosition typeQualifierPos |
-          typeQualifierPos.isTypeQualifier() and
-          MkAssocFunctionCallCand(afc_, typeQualifierPos, _, _)
-              .(AssocFunctionCallCand)
-              .hasNoInherentTargetCheck()
-        )
-      else any()
+      afc_.hasNoInherentTarget(selfPosAdj_, derefChain, borrow)
     }
 
     pragma[nomagic]