wip3

Author: hvitved

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

@@ -1790,35 +1790,20 @@ private module AssocFunctionResolution {
       FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
       int n
     ) {
-      (
-        this.supportsAutoDerefAndBorrow() and
-        selfPos.isSelf()
-        or
-        // needed for the `hasNoCompatibleTarget` check in
-        // `ArgSatisfiesBlanketLikeConstraintInput::hasBlanketCandidate`
-        derefChain.isEmpty()
-      ) and
+      this.supportsAutoDerefAndBorrow() and
+      selfPos.isSelf() and
       strippedType =
         this.getComplexStrippedSelfType(selfPos, derefChain, TNoBorrowKind(), strippedTypePath) and
       n = -1
       or
+      this.hasNoCompatibleTargetNoBorrowToIndex(selfPos, derefChain, strippedTypePath, strippedType,
+        n - 1) and
       exists(Type t |
-        this.hasNoCompatibleTargetNoBorrowToIndexRec(selfPos, derefChain, strippedTypePath,
-          strippedType, n, t) and
+        t = getNthLookupType(strippedType, n) and
         this.hasNoCompatibleTargetCheck(selfPos, derefChain, TNoBorrowKind(), strippedTypePath, t)
       )
     }
 
-    pragma[nomagic]
-    private predicate hasNoCompatibleTargetNoBorrowToIndexRec(
-      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
-      int n, Type t
-    ) {
-      this.hasNoCompatibleTargetNoBorrowToIndex(selfPos, derefChain, strippedTypePath, strippedType,
-        n - 1) and
-      t = getNthLookupType(strippedType, n)
-    }
-
     /**
      * Holds if the candidate receiver type represented by `derefChain` does not
      * have a matching call target at `selfPos`.
@@ -1841,32 +1826,30 @@ private module AssocFunctionResolution {
         this.supportsAutoDerefAndBorrow() and
         selfPos.isSelf()
         or
-        // needed for the `hasNoCompatibleTarget` check in
+        // needed for the `hasNoCompatibleNonBlanketTarget` check in
         // `ArgSatisfiesBlanketLikeConstraintInput::hasBlanketCandidate`
-        derefChain.isEmpty()
+        exists(ImplItemNode i, FunctionPosition selfPosAdj |
+          derefChain.isEmpty() and
+          blanketLikeCandidate(this, _, _, selfPosAdj, i, _, _, _) and
+          i.isBlanketImplementation() and
+          if this.hasReceiver()
+          then selfPosAdj = selfPos.getFunctionCallAdjusted()
+          else selfPosAdj = selfPos
+        )
       ) and
       strippedType =
         this.getComplexStrippedSelfType(selfPos, derefChain, TNoBorrowKind(), strippedTypePath) and
       n = -1
       or
+      this.hasNoCompatibleNonBlanketTargetNoBorrowToIndex(selfPos, derefChain, strippedTypePath,
+        strippedType, n - 1) and
       exists(Type t |
-        this.hasNoCompatibleNonBlanketTargetNoBorrowToIndexRec(selfPos, derefChain,
-          strippedTypePath, strippedType, n, t) and
+        t = getNthLookupType(strippedType, n) and
         this.hasNoCompatibleNonBlanketTargetCheck(selfPos, derefChain, TNoBorrowKind(),
           strippedTypePath, t)
       )
     }
 
-    pragma[nomagic]
-    private predicate hasNoCompatibleNonBlanketTargetNoBorrowToIndexRec(
-      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
-      int n, Type t
-    ) {
-      this.hasNoCompatibleNonBlanketTargetNoBorrowToIndex(selfPos, derefChain, strippedTypePath,
-        strippedType, n - 1) and
-      t = getNthLookupType(strippedType, n)
-    }
-
     /**
      * Holds if the candidate receiver type represented by `derefChain` does not have
      * a matching non-blanket call target at `selfPos`.
@@ -1893,24 +1876,15 @@ private module AssocFunctionResolution {
           strippedTypePath) and
       n = -1
       or
+      this.hasNoCompatibleTargetSharedBorrowToIndex(selfPos, derefChain, strippedTypePath,
+        strippedType, n - 1) and
       exists(Type t |
-        this.hasNoCompatibleTargetSharedBorrowToIndexRec(selfPos, derefChain, strippedTypePath,
-          strippedType, n, t) and
+        t = getNthLookupType(strippedType, n) and
         this.hasNoCompatibleNonBlanketLikeTargetCheck(selfPos, derefChain, TSomeBorrowKind(false),
           strippedTypePath, t)
       )
     }
 
-    pragma[nomagic]
-    private predicate hasNoCompatibleTargetSharedBorrowToIndexRec(
-      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
-      int n, Type t
-    ) {
-      this.hasNoCompatibleTargetSharedBorrowToIndex(selfPos, derefChain, strippedTypePath,
-        strippedType, n - 1) and
-      t = getNthLookupType(strippedType, n)
-    }
-
     /**
      * Holds if the candidate receiver type represented by `derefChain`, followed
      * by a shared borrow, does not have a matching call target at `selfPos`.
@@ -1934,24 +1908,15 @@ private module AssocFunctionResolution {
         this.getComplexStrippedSelfType(selfPos, derefChain, TSomeBorrowKind(true), strippedTypePath) and
       n = -1
       or
+      this.hasNoCompatibleTargetMutBorrowToIndex(selfPos, derefChain, strippedTypePath,
+        strippedType, n - 1) and
       exists(Type t |
-        this.hasNoCompatibleTargetMutBorrowToIndexRec(selfPos, derefChain, strippedTypePath,
-          strippedType, n, t) and
+        t = getNthLookupType(strippedType, n) and
         this.hasNoCompatibleNonBlanketLikeTargetCheck(selfPos, derefChain, TSomeBorrowKind(true),
           strippedTypePath, t)
       )
     }
 
-    pragma[nomagic]
-    private predicate hasNoCompatibleTargetMutBorrowToIndexRec(
-      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
-      int n, Type t
-    ) {
-      this.hasNoCompatibleTargetMutBorrowToIndex(selfPos, derefChain, strippedTypePath,
-        strippedType, n - 1) and
-      t = getNthLookupType(strippedType, n)
-    }
-
     /**
      * Holds if the candidate receiver type represented by `derefChain`, followed
      * by a `mut` borrow, does not have a matching call target at `selfPos`.
@@ -1976,24 +1941,15 @@ private module AssocFunctionResolution {
           strippedTypePath) and
       n = -1
       or
+      this.hasNoCompatibleNonBlanketTargetSharedBorrowToIndex(selfPos, derefChain, strippedTypePath,
+        strippedType, n - 1) and
       exists(Type t |
-        this.hasNoCompatibleNonBlanketTargetSharedBorrowToIndexRec(selfPos, derefChain,
-          strippedTypePath, strippedType, n, t) and
+        t = getNthLookupType(strippedType, n) and
         this.hasNoCompatibleNonBlanketTargetCheck(selfPos, derefChain, TSomeBorrowKind(false),
           strippedTypePath, t)
       )
     }
 
-    pragma[nomagic]
-    private predicate hasNoCompatibleNonBlanketTargetSharedBorrowToIndexRec(
-      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
-      int n, Type t
-    ) {
-      this.hasNoCompatibleNonBlanketTargetSharedBorrowToIndex(selfPos, derefChain, strippedTypePath,
-        strippedType, n - 1) and
-      t = getNthLookupType(strippedType, n)
-    }
-
     /**
      * Holds if the candidate receiver type represented by `derefChain`, followed
      * by a shared borrow, does not have a matching non-blanket call target at `selfPos`.
@@ -2019,24 +1975,15 @@ private module AssocFunctionResolution {
         this.getComplexStrippedSelfType(selfPos, derefChain, TSomeBorrowKind(true), strippedTypePath) and
       n = -1
       or
+      this.hasNoCompatibleNonBlanketTargetMutBorrowToIndex(selfPos, derefChain, strippedTypePath,
+        strippedType, n - 1) and
       exists(Type t |
-        this.hasNoCompatibleNonBlanketTargetMutBorrowToIndexRec(selfPos, derefChain,
-          strippedTypePath, strippedType, n, t) and
+        t = getNthLookupType(strippedType, n) and
         this.hasNoCompatibleNonBlanketTargetCheck(selfPos, derefChain, TSomeBorrowKind(true),
           strippedTypePath, t)
       )
     }
 
-    pragma[nomagic]
-    private predicate hasNoCompatibleNonBlanketTargetMutBorrowToIndexRec(
-      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
-      int n, Type t
-    ) {
-      this.hasNoCompatibleNonBlanketTargetMutBorrowToIndex(selfPos, derefChain, strippedTypePath,
-        strippedType, n - 1) and
-      t = getNthLookupType(strippedType, n)
-    }
-
     /**
      * Holds if the candidate receiver type represented by `derefChain`, followed
      * by a `mut` borrow, does not have a matching non-blanket call target at `selfPos`.
@@ -2486,7 +2433,7 @@ private module AssocFunctionResolution {
         // this is to account for codebases that use the (unstable) specialization feature
         // (https://rust-lang.github.io/rfcs/1210-impl-specialization.html), as well as
         // cases where our blanket implementation filtering is not precise enough.
-        (afcc.hasNoCompatibleNonBlanketTarget() or not impl.isBlanketImplementation())
+        if impl.isBlanketImplementation() then afcc.hasNoCompatibleNonBlanketTarget() else any()
       |
         borrow.isNoBorrow()
         or