wip2

Author: hvitved

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

@@ -1570,40 +1570,40 @@ private class FunctionCallExpr extends CallExpr {
   }
 
   pragma[nomagic]
-  Function getAnAmbigousCandiate(ImplItemNode impl, int pos) {
-    exists(TraitItemNode trait, Function traitFunction |
+  Function getAnAmbigousCandiate(ImplItemNode impl, int pos, Function f) {
+    exists(TraitItemNode trait |
       trait = this.getTrait() and
-      traitFunction = this.getResolvedFunction() and
-      result.implements(traitFunction) and
+      f = this.getResolvedFunction() and
+      result.implements(f) and
       result = impl.getAnAssocItem()
     |
       assocFuncResolutionDependsOnArgument(result, impl, pos)
       or
       not assocFuncResolutionDependsOnArgument(result, _, _) and
-      traitTypeParameterOccurrence(trait, traitFunction, _, pos, _)
+      traitTypeParameterOccurrence(trait, f, _, pos, _)
     )
     or
-    result = this.getResolvedFunction() and
+    f = this.getResolvedFunction() and
+    result = f and
     assocFuncResolutionDependsOnArgument(result, impl, pos)
   }
 
-  Function getAnAmbigousCandiate(ImplItemNode impl, int pos, int rnk) {
-    pos = rank[rnk + 1](int pos0 | result = this.getAnAmbigousCandiate(impl, pos0) | pos0)
+  Function getAnAmbigousCandiate(ImplItemNode impl, int pos, Function f, int rnk) {
+    pos = rank[rnk + 1](int pos0 | result = this.getAnAmbigousCandiate(impl, pos0, f) | pos0)
   }
 }
 
 private newtype TAmbigousAssocFunctionCallExpr =
-  MkAmbigousAssocFunctionCallExpr(FunctionCallExpr call, Function f, ImplItemNode impl, int pos) {
-    f = call.getAnAmbigousCandiate(impl, pos)
+  MkAmbigousAssocFunctionCallExpr(FunctionCallExpr call, Function f, int pos) {
+    exists(call.getAnAmbigousCandiate(_, pos, f))
   }
 
 private class AmbigousAssocFunctionCallExpr extends MkAmbigousAssocFunctionCallExpr {
   FunctionCallExpr call;
   Function f;
-  ImplItemNode impl_;
   int pos;
 
-  AmbigousAssocFunctionCallExpr() { this = MkAmbigousAssocFunctionCallExpr(call, f, impl_, pos) }
+  AmbigousAssocFunctionCallExpr() { this = MkAmbigousAssocFunctionCallExpr(call, f, pos) }
 
   pragma[nomagic]
   Type getTypeAt(TypePath path) {
@@ -1625,7 +1625,10 @@ private module AmbigousAssocFuncIsInstantiationOfInput implements
   predicate potentialInstantiationOf(
     AmbigousAssocFunctionCallExpr ce, TypeAbstraction impl, TypeMention constraint
   ) {
-    exists(Function cand, int pos | ce = MkAmbigousAssocFunctionCallExpr(_, cand, impl, pos) |
+    exists(FunctionCallExpr call, Function f, Function cand, int pos |
+      ce = MkAmbigousAssocFunctionCallExpr(call, f, pos) and
+      cand = call.getAnAmbigousCandiate(impl, pos, f)
+    |
       constraint = cand.getParam(pos).getTypeRepr()
       or
       pos = -1 and
@@ -1645,10 +1648,10 @@ private ItemNode resolveUnambigousFunctionCallTarget(FunctionCallExpr call) {
 
 pragma[nomagic]
 private Function resolveAmbigousFunctionCallTargetFromIndex(FunctionCallExpr call, int index) {
-  exists(Impl impl, int pos |
+  exists(Impl impl, int pos, Function f |
     IsInstantiationOf<AmbigousAssocFunctionCallExpr, AmbigousAssocFuncIsInstantiationOfInput>::isInstantiationOf(MkAmbigousAssocFunctionCallExpr(call,
-        result, _, pos), impl, _) and
-    result = call.getAnAmbigousCandiate(impl, pos, index)
+        f, pos), impl, _) and
+    result = call.getAnAmbigousCandiate(impl, pos, f, index)
   |
     index = 0
     or
@@ -1663,7 +1666,7 @@ pragma[nomagic]
 private Function resolveAmbigousFunctionCallTarget(FunctionCallExpr call) {
   result =
     resolveAmbigousFunctionCallTargetFromIndex(call,
-      max(int index | result = call.getAnAmbigousCandiate(_, _, index)))
+      max(int index | result = call.getAnAmbigousCandiate(_, _, _, index)))
 }
 
 pragma[inline]