wip

Author: hvitved

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

@@ -1807,66 +1807,36 @@ private module AssocFunctionResolution {
     }
 
     /**
-     * Holds if the candidate receiver type represented by `derefChain` does not
-     * have a matching call target at function-call adjusted position `selfPos`.
+     * Holds if the candidate receiver type represented by `derefChain` and `borrow`
+     * does not have a matching call target at function-call adjusted position `selfPos`.
      */
-    predicate hasNoCompatibleTargetNoBorrow(FunctionPosition selfPos, DerefChain derefChain) {
-      NoCompatibleTarget::Borrow::hasNoCompatibleTarget(this, selfPos, derefChain, _)
+    predicate hasNoCompatibleTarget(
+      FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
+    ) {
+      NoCompatibleTarget::Any::hasNoCompatibleTarget(this, selfPos, derefChain, borrow)
     }
 
     /**
      * Holds if the candidate receiver type represented by `derefChain` does not have
      * a matching non-blanket call target at function-call adjusted position `selfPos`.
      */
-    predicate hasNoCompatibleNonBlanketTargetNoBorrow(
-      FunctionPosition selfPos, DerefChain derefChain
-    ) {
-      NoCompatibleTarget::BorrowNonBlanket::hasNoCompatibleNonBlanketTarget(this, selfPos,
-        derefChain, _)
-    }
-
-    /**
-     * Holds if the candidate receiver type represented by `derefChain`, followed
-     * by a shared borrow, does not have a matching call target at function-call
-     * adjusted position `selfPos`.
-     */
-    predicate hasNoCompatibleTargetSharedBorrow(FunctionPosition selfPos, DerefChain derefChain) {
-      NoCompatibleTarget::SharedBorrow::hasNoCompatibleNonBlanketLikeTarget(this, selfPos,
-        derefChain, _)
-    }
-
-    /**
-     * Holds if the candidate receiver type represented by `derefChain`, followed
-     * by a `mut` borrow, does not have a matching call target at function-call
-     * adjusted position `selfPos`.
-     */
-    predicate hasNoCompatibleTargetMutBorrow(FunctionPosition selfPos, DerefChain derefChain) {
-      NoCompatibleTarget::MutBorrow::hasNoCompatibleNonBlanketLikeTarget(this, selfPos, derefChain,
-        _)
-    }
-
-    /**
-     * Holds if the candidate receiver type represented by `derefChain`, followed
-     * by a shared borrow, does not have a matching non-blanket call target at
-     * function-call adjusted position `selfPos`.
-     */
-    predicate hasNoCompatibleNonBlanketTargetSharedBorrow(
-      FunctionPosition selfPos, DerefChain derefChain
+    predicate hasNoCompatibleNonBlanketLikeTarget(
+      FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
     ) {
-      NoCompatibleTarget::SharedBorrowNonBlanket::hasNoCompatibleNonBlanketTarget(this, selfPos,
-        derefChain, _)
+      NoCompatibleTarget::Any::hasNoCompatibleNonBlanketLikeTarget(this, selfPos, derefChain, borrow)
     }
 
     /**
-     * Holds if the candidate receiver type represented by `derefChain`, followed
-     * by a `mut` borrow, does not have a matching non-blanket call target at
-     * function-call adjusted position `selfPos`.
+     * Holds if the candidate receiver type represented by `derefChain` and `borrow`
+     * does not have a matching non-blanket call target at function-call adjusted
+     * position `selfPos`.
      */
-    predicate hasNoCompatibleNonBlanketTargetMutBorrow(
-      FunctionPosition selfPos, DerefChain derefChain
+    predicate hasNoCompatibleNonBlanketTarget(
+      FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
     ) {
-      NoCompatibleTarget::MutBorrowNonBlanket::hasNoCompatibleNonBlanketTarget(this, selfPos,
-        derefChain, _)
+      // NoCompatibleTarget::NonBlanket::hasNoCompatibleNonBlanketTarget(this, selfPos, derefChain,
+      //   borrow)
+      NoCompatibleTarget::Any::hasNoCompatibleNonBlanketTarget(this, selfPos, derefChain, borrow)
     }
 
     /**
@@ -1917,11 +1887,11 @@ private module AssocFunctionResolution {
       or
       exists(RefType rt |
         // first try shared borrow
-        this.hasNoCompatibleTargetNoBorrow(selfPos, derefChain) and
+        this.hasNoCompatibleTarget(selfPos, derefChain, TNoBorrowKind()) and
         borrow.isSharedBorrow()
         or
         // then try mutable borrow
-        this.hasNoCompatibleTargetSharedBorrow(selfPos, derefChain) and
+        this.hasNoCompatibleNonBlanketLikeTarget(selfPos, derefChain, TSomeBorrowKind(false)) and
         borrow.isMutableBorrow()
       |
         rt = borrow.getRefType() and
@@ -2298,20 +2268,30 @@ private module AssocFunctionResolution {
       }
     }
 
-    bindingset[derefChain]
-    private predicate borrowCand(
+    pragma[nomagic]
+    private predicate sharedBorrowCand(
       AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
     ) {
-      afc.supportsAutoDerefAndBorrow() and
-      afc.hasReceiverAtPos(selfPos) and
-      exists(derefChain) and
-      borrow = TNoBorrowKind()
+      exists(BorrowKind prev |
+        afc.hasNoCompatibleTarget(selfPos, derefChain, prev) and
+        prev.isNoBorrow() and
+        borrow.isSharedBorrow()
+      )
     }
 
-    module Borrow = Checks<borrowCand/4>;
+    pragma[nomagic]
+    private predicate mutBorrowCand(
+      AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
+    ) {
+      exists(BorrowKind prev |
+        afc.hasNoCompatibleNonBlanketLikeTarget(selfPos, derefChain, prev) and
+        prev.isSharedBorrow() and
+        borrow.isMutableBorrow()
+      )
+    }
 
     bindingset[derefChain]
-    private predicate borrowNonBlanketCand(
+    private predicate anyCand(
       AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
     ) {
       (
@@ -2327,50 +2307,56 @@ private module AssocFunctionResolution {
           i.isBlanketImplementation()
         )
       ) and
-      borrow = TNoBorrowKind()
-    }
-
-    module BorrowNonBlanket = Checks<borrowNonBlanketCand/4>;
-
-    pragma[nomagic]
-    private predicate sharedBorrowCand(
-      AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
-    ) {
-      afc.hasNoCompatibleTargetNoBorrow(selfPos, derefChain) and
-      borrow = TSomeBorrowKind(false)
+      borrow.isNoBorrow()
+      or
+      sharedBorrowCand(afc, selfPos, derefChain, borrow)
+      or
+      mutBorrowCand(afc, selfPos, derefChain, borrow)
     }
 
-    module SharedBorrow = Checks<sharedBorrowCand/4>;
+    module Any = Checks<anyCand/4>;
 
-    pragma[nomagic]
-    private predicate mutBorrowCand(
+    bindingset[derefChain]
+    private predicate nonBlanketCand(
       AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
     ) {
-      afc.hasNoCompatibleTargetSharedBorrow(selfPos, derefChain) and
-      borrow = TSomeBorrowKind(true)
+      (
+        afc.supportsAutoDerefAndBorrow() and
+        afc.hasReceiverAtPos(selfPos) and
+        exists(derefChain)
+        or
+        // needed for the `hasNoCompatibleNonBlanketTarget` check in
+        // `ArgSatisfiesBlanketLikeConstraintInput::hasBlanketCandidate`
+        exists(ImplItemNode i |
+          derefChain.isEmpty() and
+          blanketLikeCandidate(afc, _, selfPos, i, _, _, _) and
+          i.isBlanketImplementation()
+        )
+      ) and
+      borrow.isNoBorrow()
+      or
+      sharedBorrowNonBlanketCand(afc, selfPos, derefChain, borrow)
+      or
+      mutBorrowNonBlanketCand(afc, selfPos, derefChain, borrow)
     }
 
-    module MutBorrow = Checks<mutBorrowCand/4>;
+    module NonBlanket = Checks<nonBlanketCand/4>;
 
     pragma[nomagic]
     private predicate sharedBorrowNonBlanketCand(
       AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
     ) {
-      afc.hasNoCompatibleTargetNoBorrow(selfPos, derefChain) and
+      afc.hasNoCompatibleTarget(selfPos, derefChain, TNoBorrowKind()) and
       borrow = TSomeBorrowKind(false)
     }
 
-    module SharedBorrowNonBlanket = Checks<sharedBorrowNonBlanketCand/4>;
-
     pragma[nomagic]
     private predicate mutBorrowNonBlanketCand(
       AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
     ) {
-      afc.hasNoCompatibleNonBlanketTargetSharedBorrow(selfPos, derefChain) and
+      afc.hasNoCompatibleNonBlanketTarget(selfPos, derefChain, TSomeBorrowKind(false)) and
       borrow = TSomeBorrowKind(true)
     }
-
-    module MutBorrowNonBlanket = Checks<mutBorrowNonBlanketCand/4>;
   }
 
   pragma[nomagic]
@@ -2409,14 +2395,7 @@ private module AssocFunctionResolution {
 
     pragma[nomagic]
     predicate hasNoCompatibleNonBlanketTarget() {
-      afc_.hasNoCompatibleNonBlanketTargetSharedBorrow(selfPos_, derefChain) and
-      borrow.isSharedBorrow()
-      or
-      afc_.hasNoCompatibleNonBlanketTargetMutBorrow(selfPos_, derefChain) and
-      borrow.isMutableBorrow()
-      or
-      afc_.hasNoCompatibleNonBlanketTargetNoBorrow(selfPos_, derefChain) and
-      borrow.isNoBorrow()
+      afc_.hasNoCompatibleNonBlanketTarget(selfPos_, derefChain, borrow)
     }
 
     pragma[nomagic]
@@ -2525,7 +2504,7 @@ private module AssocFunctionResolution {
       MkCallDerefCand(AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain) {
         afc.supportsAutoDerefAndBorrow() and
         afc.hasReceiverAtPos(selfPos) and
-        afc.hasNoCompatibleTargetMutBorrow(selfPos, derefChain) and
+        afc.hasNoCompatibleNonBlanketLikeTarget(selfPos, derefChain, TSomeBorrowKind(true)) and
         exists(afc.getSelfTypeAtNoBorrow(selfPos, derefChain, TypePath::nil()))
       }