wip

Author: hvitved

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

@@ -1630,6 +1630,20 @@ private module AssocFunctionResolution {
     )
   }
 
+  pragma[nomagic]
+  private predicate assocFunctionSelfInfoBlanketLikeCand(
+    Function f, string name, int arity, FunctionPosition selfPos, FunctionPosition selfPosAdj,
+    ImplItemNode impl, AssocFunctionType selfType, TypePath blanketPath, TypeParam blanketTypeParam,
+    TypeOption traitQualifier, boolean hasReceiver
+  ) {
+    exists(Trait trait, boolean isMethod |
+      assocFunctionSelfInfoBlanketLike(f, name, arity, selfPos, selfPosAdj, impl, trait, selfType,
+        blanketPath, blanketTypeParam, isMethod) and
+      traitQualifier = [TypeOption::some(TTrait(trait)), any(TypeOption non | non.isNone())] and
+      hasReceiver = [isMethod, false]
+    )
+  }
+
   /**
    * Holds if call `afc` may target function `f` in blanket (like) implementation
    * `impl` with type `selfType` at `selfPos`.
@@ -1647,11 +1661,10 @@ private module AssocFunctionResolution {
     AssocFunctionCall afc, Function f, FunctionPosition selfPos, FunctionPosition selfPosAdj,
     ImplItemNode impl, AssocFunctionType self, TypePath blanketPath, TypeParam blanketTypeParam
   ) {
-    exists(string name, int arity, Trait trait, boolean isMethod |
-      callInfo(afc, name, arity, _,
-        [TypeOption::some(TTrait(trait)), any(TypeOption non | non.isNone())], [false, isMethod]) and
-      assocFunctionSelfInfoBlanketLike(f, name, arity, selfPos, selfPosAdj, impl, trait, self,
-        blanketPath, blanketTypeParam, isMethod)
+    exists(string name, int arity, TypeOption traitQualifier, boolean hasReceiver |
+      callInfo(afc, name, arity, _, traitQualifier, hasReceiver) and
+      assocFunctionSelfInfoBlanketLikeCand(f, name, arity, selfPos, selfPosAdj, impl, self,
+        blanketPath, blanketTypeParam, traitQualifier, hasReceiver)
     |
       if not afc.hasATrait() then callVisibleImplTraitCandidate(afc, impl) else any()
     )