wip

Author: hvitved

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

@@ -2409,16 +2409,28 @@ private module AssocFunctionResolution {
     predicate hasNoInherentTarget() {
       afc_.hasTrait()
       or
-      exists(TypePath strippedTypePath, Type strippedType, string name, int arity |
+      exists(
+        TypePath strippedTypePath, Type strippedType, string name, int arity,
+        TypeOption typeQualifier, TypeOption traitQualifier, boolean hasReceiver
+      |
+        // Calls to inherent functions are always of the form `x.m(...)` or `Foo::bar(...)`,
+        // where `Foo` is a type. In case `bar` is a method, we can use both the type qualifier
+        // and the type of the first argument to rule out candidates
+        selfPosAdj_.isTypeQualifier() and hasReceiver = false
+        or
+        selfPosAdj_.asPosition() = 0 and hasReceiver = true
+      |
+        callInfo(afc_, name, arity, typeQualifier, traitQualifier, _) and
         this.hasSignature(_, selfPosAdj_, strippedTypePath, strippedType, name, arity) and
         forall(Impl i |
+          i.isInherent() and
           (
-            assocFunctionInfoNonBlanketLike(_, name, arity, selfPosAdj_, i, _, strippedTypePath,
-              strippedType, _, _, _) or
-            assocFunctionInfoNonBlanketLikeTypeParam(_, name, arity, selfPosAdj_, i, _,
-              strippedTypePath, _, _, _)
-          ) and
-          i.isInherent()
+            assocFunctionInfoNonBlanketLikeCand(_, name, arity, selfPosAdj_, i, _, strippedTypePath,
+              strippedType, typeQualifier, traitQualifier, hasReceiver)
+            or
+            assocFunctionInfoNonBlanketLikeTypeParamCand(_, name, arity, selfPosAdj_, i, _,
+              strippedTypePath, typeQualifier, traitQualifier, hasReceiver)
+          )
         |
           this.hasIncompatibleInherentTarget(i)
         )
@@ -2654,7 +2666,13 @@ private module AssocFunctionResolution {
       AssocFunctionCallCand afcc, TypeAbstraction abs, AssocFunctionType constraint
     ) {
       SelfArgIsInstantiationOfInput::potentialInstantiationOf0(afcc, abs, constraint) and
-      abs.(Impl).isInherent()
+      abs.(Impl).isInherent() and
+      exists(AssocFunctionCall afc, FunctionPosition selfPosAdj |
+        afcc = MkAssocFunctionCallCand(afc, selfPosAdj, _, _)
+      |
+        selfPosAdj.isTypeQualifier() or
+        afc.hasReceiverPos(selfPosAdj)
+      )
     }
   }