wip3

Author: hvitved

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

@@ -1821,48 +1821,14 @@ private module AssocFunctionResolution {
       )
     }
 
-    bindingset[derefChain, borrow, strippedTypePath, strippedType]
-    private predicate hasNoCompatibleNonBlanketLikeTargetCheck_(
-      FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow, TypePath strippedTypePath,
-      Type strippedType
-    ) {
-      forall(ImplOrTraitItemNode i |
-        nonBlanketLikeCandidate(this, selfPos, i, _, strippedTypePath, strippedType)
-      |
-        this.hasIncompatibleTarget(i, selfPos, derefChain, borrow, strippedType)
-      )
-    }
-
-    // forex using recursion
-    pragma[nomagic]
-    private predicate hasNoCompatibleTargetNoBorrowToIndex(
-      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
-      int n
-    ) {
-      Foo<hasNoCompatibleTargetNoBorrowToIndex/4>::hasNoCompatibleTargetCheck(this, selfPos,
-        derefChain, _, strippedTypePath, strippedType, n)
-    }
-
     /**
      * Holds if the candidate receiver type represented by `derefChain` does not
      * have a matching call target at function-call adjusted position `selfPos`.
      */
     pragma[nomagic]
     predicate hasNoCompatibleTargetNoBorrow(FunctionPosition selfPos, DerefChain derefChain) {
-      exists(Type strippedType |
-        this.hasNoCompatibleTargetNoBorrowToIndex(selfPos, derefChain, _, strippedType,
-          getLastLookupTypeIndex(this, strippedType))
-      )
-    }
-
-    // forex using recursion
-    pragma[nomagic]
-    private predicate hasNoCompatibleNonBlanketTargetNoBorrowToIndex(
-      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
-      int n
-    ) {
-      Foo<hasNoCompatibleNonBlanketTargetNoBorrowToIndex/4>::hasNoCompatibleNonBlanketTargetCheck(this,
-        selfPos, derefChain, _, strippedTypePath, strippedType, n)
+      Foo<hasNoCompatibleTargetNoBorrowToIndex/4>::hasNoCompatibleTargetCheck(this, selfPos,
+        derefChain, _)
     }
 
     /**
@@ -1873,22 +1839,8 @@ private module AssocFunctionResolution {
     predicate hasNoCompatibleNonBlanketTargetNoBorrow(
       FunctionPosition selfPos, DerefChain derefChain
     ) {
-      exists(Type strippedType |
-        this.hasNoCompatibleNonBlanketTargetNoBorrowToIndex(selfPos, derefChain, _, strippedType,
-          getLastLookupTypeIndex(this, strippedType))
-      )
-    }
-
-    // forex using recursion
-    pragma[nomagic]
-    private predicate hasNoCompatibleTargetSharedBorrowToIndex(
-      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
-      int n
-    ) {
-      // hasNoCompatibleTargetSharedBorrowToIndex(this, selfPos, derefChain, _, strippedTypePath,
-      //   strippedType, n)
-      Foo<hasNoCompatibleTargetSharedBorrowToIndex/4>::hasNoCompatibleNonBlanketLikeTargetCheck(this,
-        selfPos, derefChain, _, strippedTypePath, strippedType, n)
+      Foo<hasNoCompatibleNonBlanketTargetNoBorrowToIndex/4>::hasNoCompatibleNonBlanketTargetCheck(this,
+        selfPos, derefChain, _)
     }
 
     /**
@@ -1898,20 +1850,8 @@ private module AssocFunctionResolution {
      */
     pragma[nomagic]
     predicate hasNoCompatibleTargetSharedBorrow(FunctionPosition selfPos, DerefChain derefChain) {
-      exists(Type strippedType |
-        this.hasNoCompatibleTargetSharedBorrowToIndex(selfPos, derefChain, _, strippedType,
-          getLastLookupTypeIndex(this, strippedType))
-      )
-    }
-
-    // forex using recursion
-    pragma[nomagic]
-    private predicate hasNoCompatibleTargetMutBorrowToIndex(
-      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
-      int n
-    ) {
-      Foo<hasNoCompatibleTargetMutBorrowToIndex/4>::hasNoCompatibleNonBlanketLikeTargetCheck(this,
-        selfPos, derefChain, _, strippedTypePath, strippedType, n)
+      Foo<hasNoCompatibleTargetSharedBorrowToIndex/4>::hasNoCompatibleNonBlanketLikeTargetCheck(this,
+        selfPos, derefChain, _)
     }
 
     /**
@@ -1921,20 +1861,8 @@ private module AssocFunctionResolution {
      */
     pragma[nomagic]
     predicate hasNoCompatibleTargetMutBorrow(FunctionPosition selfPos, DerefChain derefChain) {
-      exists(Type strippedType |
-        this.hasNoCompatibleTargetMutBorrowToIndex(selfPos, derefChain, _, strippedType,
-          getLastLookupTypeIndex(this, strippedType))
-      )
-    }
-
-    // forex using recursion
-    pragma[nomagic]
-    private predicate hasNoCompatibleNonBlanketTargetSharedBorrowToIndex(
-      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
-      int n
-    ) {
-      Foo<hasNoCompatibleNonBlanketTargetSharedBorrowToIndex/4>::hasNoCompatibleNonBlanketTargetCheck(this,
-        selfPos, derefChain, _, strippedTypePath, strippedType, n)
+      Foo<hasNoCompatibleTargetMutBorrowToIndex/4>::hasNoCompatibleNonBlanketLikeTargetCheck(this,
+        selfPos, derefChain, _)
     }
 
     /**
@@ -1946,20 +1874,8 @@ private module AssocFunctionResolution {
     predicate hasNoCompatibleNonBlanketTargetSharedBorrow(
       FunctionPosition selfPos, DerefChain derefChain
     ) {
-      exists(Type strippedType |
-        this.hasNoCompatibleNonBlanketTargetSharedBorrowToIndex(selfPos, derefChain, _,
-          strippedType, getLastLookupTypeIndex(this, strippedType))
-      )
-    }
-
-    // forex using recursion
-    pragma[nomagic]
-    private predicate hasNoCompatibleNonBlanketTargetMutBorrowToIndex(
-      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
-      int n
-    ) {
-      Foo<hasNoCompatibleNonBlanketTargetMutBorrowToIndex/4>::hasNoCompatibleNonBlanketTargetCheck(this,
-        selfPos, derefChain, _, strippedTypePath, strippedType, n)
+      Foo<hasNoCompatibleNonBlanketTargetSharedBorrowToIndex/4>::hasNoCompatibleNonBlanketTargetCheck(this,
+        selfPos, derefChain, _)
     }
 
     /**
@@ -1971,10 +1887,8 @@ private module AssocFunctionResolution {
     predicate hasNoCompatibleNonBlanketTargetMutBorrow(
       FunctionPosition selfPos, DerefChain derefChain
     ) {
-      exists(Type strippedType |
-        this.hasNoCompatibleNonBlanketTargetMutBorrowToIndex(selfPos, derefChain, _, strippedType,
-          getLastLookupTypeIndex(this, strippedType))
-      )
+      Foo<hasNoCompatibleNonBlanketTargetMutBorrowToIndex/4>::hasNoCompatibleNonBlanketTargetCheck(this,
+        selfPos, derefChain, _)
     }
 
     /**
@@ -2160,13 +2074,15 @@ private module AssocFunctionResolution {
     ) {
       (
         foo(afc, selfPos, derefChain, borrow, strippedTypePath, strippedType, n - 1) or
-        hasNoCompatibleNonBlanketLikeTargetCheck(afc, selfPos, derefChain, borrow, strippedTypePath,
-          strippedType, n - 1)
+        hasNoCompatibleNonBlanketLikeTargetCheckToIndex(afc, selfPos, derefChain, borrow,
+          strippedTypePath, strippedType, n - 1)
       ) and
       t = getNthLookupType(afc, strippedType, n)
     }
 
-    predicate hasNoCompatibleNonBlanketLikeTargetCheck(
+    // forex using recursion
+    pragma[nomagic]
+    private predicate hasNoCompatibleNonBlanketLikeTargetCheckToIndex(
       AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
       TypePath strippedTypePath, Type strippedType, int n
     ) {
@@ -2180,23 +2096,31 @@ private module AssocFunctionResolution {
       )
     }
 
+    pragma[nomagic]
+    predicate hasNoCompatibleNonBlanketLikeTargetCheck(
+      AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
+    ) {
+      exists(Type strippedType |
+        hasNoCompatibleNonBlanketLikeTargetCheckToIndex(afc, selfPos, derefChain, borrow, _,
+          strippedType, getLastLookupTypeIndex(afc, strippedType))
+      )
+    }
+
+    pragma[nomagic]
     predicate hasNoCompatibleTargetCheck(
-      AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
-      TypePath strippedTypePath, Type strippedType, int n
+      AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
     ) {
-      hasNoCompatibleNonBlanketLikeTargetCheck(afc, selfPos, derefChain, borrow, strippedTypePath,
-        strippedType, n) and
+      hasNoCompatibleNonBlanketLikeTargetCheck(afc, selfPos, derefChain, borrow) and
       forall(ImplItemNode i | blanketLikeCandidate(afc, selfPos, i, _, _, _) |
         afc.hasIncompatibleBlanketLikeTarget(i, selfPos, derefChain, borrow)
       )
     }
 
+    pragma[nomagic]
     predicate hasNoCompatibleNonBlanketTargetCheck(
-      AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
-      TypePath strippedTypePath, Type strippedType, int n
+      AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
     ) {
-      hasNoCompatibleNonBlanketLikeTargetCheck(afc, selfPos, derefChain, borrow, strippedTypePath,
-        strippedType, n) and
+      hasNoCompatibleNonBlanketLikeTargetCheck(afc, selfPos, derefChain, borrow) and
       forall(ImplItemNode i |
         blanketLikeCandidate(afc, selfPos, i, _, _, _) and
         not i.isBlanketImplementation()