wip2

Author: hvitved

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

@@ -1537,7 +1537,6 @@ private module AssocFunctionResolution {
     AssocFunctionCall afc, FunctionPosition selfPos, ImplOrTraitItemNode i,
     AssocFunctionType selfType, TypePath strippedTypePath, Type strippedType
   ) {
-    not i.toString().matches("%RangeChecker%") and
     exists(
       string name, int arity, TypeOption typeQualifier, TypeOption traitQualifier,
       boolean hasReceiver, boolean hasNoTrait, boolean isImplTrait
@@ -1803,6 +1802,13 @@ private module AssocFunctionResolution {
       result != TUnknownType()
     }
 
+    private Type testgetComplexStrippedSelfType(
+      FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow, TypePath strippedTypePath
+    ) {
+      result = this.getComplexStrippedSelfType(selfPos, derefChain, borrow, strippedTypePath) and
+      this = Debug::getRelevantLocatable()
+    }
+
     pragma[nomagic]
     Type getComplexStrippedSelfType(
       FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow, TypePath strippedTypePath
@@ -1833,8 +1839,8 @@ private module AssocFunctionResolution {
       FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
       int n
     ) {
-      hasNoCompatibleTargetNoBorrowToIndex(this, selfPos, derefChain, _, strippedTypePath,
-        strippedType, n)
+      Foo<hasNoCompatibleTargetNoBorrowToIndex/4>::hasNoCompatibleTargetCheck(this, selfPos,
+        derefChain, _, strippedTypePath, strippedType, n)
     }
 
     /**
@@ -1855,8 +1861,8 @@ private module AssocFunctionResolution {
       FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
       int n
     ) {
-      hasNoCompatibleNonBlanketTargetNoBorrowToIndex(this, selfPos, derefChain, _, strippedTypePath,
-        strippedType, n)
+      Foo<hasNoCompatibleNonBlanketTargetNoBorrowToIndex/4>::hasNoCompatibleNonBlanketTargetCheck(this,
+        selfPos, derefChain, _, strippedTypePath, strippedType, n)
     }
 
     /**
@@ -1879,8 +1885,10 @@ private module AssocFunctionResolution {
       FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
       int n
     ) {
-      hasNoCompatibleTargetSharedBorrowToIndex(this, selfPos, derefChain, _, strippedTypePath,
-        strippedType, n)
+      // hasNoCompatibleTargetSharedBorrowToIndex(this, selfPos, derefChain, _, strippedTypePath,
+      //   strippedType, n)
+      Foo<hasNoCompatibleTargetSharedBorrowToIndex/4>::hasNoCompatibleNonBlanketLikeTargetCheck(this,
+        selfPos, derefChain, _, strippedTypePath, strippedType, n)
     }
 
     /**
@@ -1902,8 +1910,8 @@ private module AssocFunctionResolution {
       FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
       int n
     ) {
-      hasNoCompatibleTargetMutBorrowToIndex(this, selfPos, derefChain, _, strippedTypePath,
-        strippedType, n)
+      Foo<hasNoCompatibleTargetMutBorrowToIndex/4>::hasNoCompatibleNonBlanketLikeTargetCheck(this,
+        selfPos, derefChain, _, strippedTypePath, strippedType, n)
     }
 
     /**
@@ -1925,21 +1933,8 @@ private module AssocFunctionResolution {
       FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
       int n
     ) {
-      hasNoCompatibleNonBlanketTargetSharedBorrowToIndex(this, selfPos, derefChain, _,
-        strippedTypePath, strippedType, n)
-      // this.hasNoCompatibleTargetNoBorrow(selfPos, derefChain) and
-      // strippedType =
-      //   this.getComplexStrippedSelfType(selfPos, derefChain, TSomeBorrowKind(false),
-      //     strippedTypePath) and
-      // n = -1
-      // or
-      // this.hasNoCompatibleNonBlanketTargetSharedBorrowToIndex(selfPos, derefChain, strippedTypePath,
-      //   strippedType, n - 1) and
-      // exists(Type t |
-      //   t = getNthLookupType(this, strippedType, n) and
-      //   this.hasNoCompatibleNonBlanketTargetCheck(selfPos, derefChain, TSomeBorrowKind(false),
-      //     strippedTypePath, t)
-      // )
+      Foo<hasNoCompatibleNonBlanketTargetSharedBorrowToIndex/4>::hasNoCompatibleNonBlanketTargetCheck(this,
+        selfPos, derefChain, _, strippedTypePath, strippedType, n)
     }
 
     /**
@@ -1963,20 +1958,8 @@ private module AssocFunctionResolution {
       FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
       int n
     ) {
-      hasNoCompatibleNonBlanketTargetMutBorrowToIndex(this, selfPos, derefChain, _,
-        strippedTypePath, strippedType, n)
-      // this.hasNoCompatibleNonBlanketTargetSharedBorrow(selfPos, derefChain) and
-      // strippedType =
-      //   this.getComplexStrippedSelfType(selfPos, derefChain, TSomeBorrowKind(true), strippedTypePath) and
-      // n = -1
-      // or
-      // this.hasNoCompatibleNonBlanketTargetMutBorrowToIndex(selfPos, derefChain, strippedTypePath,
-      //   strippedType, n - 1) and
-      // exists(Type t |
-      //   t = getNthLookupType(this, strippedType, n) and
-      //   this.hasNoCompatibleNonBlanketTargetCheck(selfPos, derefChain, TSomeBorrowKind(true),
-      //     strippedTypePath, t)
-      // )
+      Foo<hasNoCompatibleNonBlanketTargetMutBorrowToIndex/4>::hasNoCompatibleNonBlanketTargetCheck(this,
+        selfPos, derefChain, _, strippedTypePath, strippedType, n)
     }
 
     /**
@@ -2092,14 +2075,14 @@ private module AssocFunctionResolution {
     }
   }
 
-  pragma[nomagic]
+  bindingset[derefChain]
   private predicate hasNoCompatibleNonBlanketTargetNoBorrowToIndex(
-    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
-    TypePath strippedTypePath, Type strippedType, int n
+    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
   ) {
     (
       afc.supportsAutoDerefAndBorrow() and
-      afc.hasReceiverAtPos(selfPos)
+      afc.hasReceiverAtPos(selfPos) and
+      exists(derefChain)
       or
       // needed for the `hasNoCompatibleNonBlanketTarget` check in
       // `ArgSatisfiesBlanketLikeConstraintInput::hasBlanketCandidate`
@@ -2109,98 +2092,86 @@ private module AssocFunctionResolution {
         i.isBlanketImplementation()
       )
     ) and
-    borrow = TNoBorrowKind() and
-    strippedType = afc.getComplexStrippedSelfType(selfPos, derefChain, borrow, strippedTypePath) and
-    n = -1
-    or
-    Foo<hasNoCompatibleNonBlanketTargetNoBorrowToIndex/7>::hasNoCompatibleNonBlanketTargetCheck(afc,
-      selfPos, derefChain, borrow, strippedTypePath, strippedType, n)
+    borrow = TNoBorrowKind()
   }
 
   pragma[nomagic]
   private predicate hasNoCompatibleNonBlanketTargetSharedBorrowToIndex(
-    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
-    TypePath strippedTypePath, Type strippedType, int n
+    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
   ) {
     afc.hasNoCompatibleTargetNoBorrow(selfPos, derefChain) and
-    borrow = TSomeBorrowKind(false) and
-    strippedType = afc.getComplexStrippedSelfType(selfPos, derefChain, borrow, strippedTypePath) and
-    n = -1
-    or
-    Foo<hasNoCompatibleNonBlanketTargetSharedBorrowToIndex/7>::hasNoCompatibleNonBlanketTargetCheck(afc,
-      selfPos, derefChain, borrow, strippedTypePath, strippedType, n)
+    borrow = TSomeBorrowKind(false)
   }
 
   pragma[nomagic]
   private predicate hasNoCompatibleNonBlanketTargetMutBorrowToIndex(
-    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
-    TypePath strippedTypePath, Type strippedType, int n
+    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
   ) {
     afc.hasNoCompatibleNonBlanketTargetSharedBorrow(selfPos, derefChain) and
-    borrow = TSomeBorrowKind(true) and
-    strippedType = afc.getComplexStrippedSelfType(selfPos, derefChain, borrow, strippedTypePath) and
-    n = -1
-    or
-    Foo<hasNoCompatibleNonBlanketTargetMutBorrowToIndex/7>::hasNoCompatibleNonBlanketTargetCheck(afc,
-      selfPos, derefChain, borrow, strippedTypePath, strippedType, n)
+    borrow = TSomeBorrowKind(true)
   }
 
-  pragma[nomagic]
+  bindingset[derefChain]
   private predicate hasNoCompatibleTargetNoBorrowToIndex(
-    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
-    TypePath strippedTypePath, Type strippedType, int n
+    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
   ) {
     afc.supportsAutoDerefAndBorrow() and
     afc.hasReceiverAtPos(selfPos) and
-    borrow = TNoBorrowKind() and
-    strippedType = afc.getComplexStrippedSelfType(selfPos, derefChain, borrow, strippedTypePath) and
-    n = -1
-    or
-    Foo<hasNoCompatibleTargetNoBorrowToIndex/7>::hasNoCompatibleTargetCheck(afc, selfPos,
-      derefChain, borrow, strippedTypePath, strippedType, n)
+    exists(derefChain) and
+    borrow = TNoBorrowKind()
   }
 
   pragma[nomagic]
   private predicate hasNoCompatibleTargetSharedBorrowToIndex(
-    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
-    TypePath strippedTypePath, Type strippedType, int n
+    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
   ) {
     afc.hasNoCompatibleTargetNoBorrow(selfPos, derefChain) and
-    borrow = TSomeBorrowKind(false) and
-    strippedType = afc.getComplexStrippedSelfType(selfPos, derefChain, borrow, strippedTypePath) and
-    n = -1
-    or
-    Foo<hasNoCompatibleTargetSharedBorrowToIndex/7>::hasNoCompatibleNonBlanketLikeTargetCheck(afc,
-      selfPos, derefChain, borrow, strippedTypePath, strippedType, n)
+    borrow = TSomeBorrowKind(false)
   }
 
   pragma[nomagic]
   private predicate hasNoCompatibleTargetMutBorrowToIndex(
-    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
-    TypePath strippedTypePath, Type strippedType, int n
+    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
   ) {
     afc.hasNoCompatibleTargetSharedBorrow(selfPos, derefChain) and
-    borrow = TSomeBorrowKind(true) and
-    strippedType = afc.getComplexStrippedSelfType(selfPos, derefChain, borrow, strippedTypePath) and
-    n = -1
-    or
-    Foo<hasNoCompatibleTargetMutBorrowToIndex/7>::hasNoCompatibleNonBlanketLikeTargetCheck(afc,
-      selfPos, derefChain, borrow, strippedTypePath, strippedType, n)
+    borrow = TSomeBorrowKind(true)
   }
 
+  bindingset[derefChain]
   private signature predicate fooSig(
-    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
-    TypePath strippedTypePath, Type strippedType, int n
+    AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
   );
 
-  private module Foo<fooSig/7 foo> {
+  private module Foo<fooSig/4 foo> {
+    pragma[nomagic]
+    private predicate foo(
+      AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
+      TypePath strippedTypePath, Type strippedType, int n
+    ) {
+      foo(afc, selfPos, derefChain, borrow) and
+      strippedType = afc.getComplexStrippedSelfType(selfPos, derefChain, borrow, strippedTypePath) and
+      n = -1
+    }
+
+    pragma[nomagic]
+    private predicate bar(
+      AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
+      TypePath strippedTypePath, Type strippedType, int n, Type t
+    ) {
+      (
+        foo(afc, selfPos, derefChain, borrow, strippedTypePath, strippedType, n - 1) or
+        hasNoCompatibleNonBlanketLikeTargetCheck(afc, selfPos, derefChain, borrow, strippedTypePath,
+          strippedType, n - 1)
+      ) and
+      t = getNthLookupType(afc, strippedType, n)
+    }
+
     predicate hasNoCompatibleNonBlanketLikeTargetCheck(
       AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
       TypePath strippedTypePath, Type strippedType, int n
     ) {
-      foo(afc, selfPos, derefChain, borrow, strippedTypePath, strippedType, n - 1) and
       exists(Type t |
-        t = getNthLookupType(afc, strippedType, n) and
+        bar(afc, selfPos, derefChain, borrow, strippedTypePath, strippedType, n, t) and
         forall(ImplOrTraitItemNode i |
           nonBlanketLikeCandidate(afc, selfPos, i, _, strippedTypePath, t)
         |
@@ -4111,7 +4082,7 @@ private module Debug {
     exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
       result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
       filepath.matches("%/main.rs") and
-      startline = 103
+      startline = 1986
     )
   }