wip3

Author: hvitved

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

@@ -480,18 +480,18 @@ private module Input3 implements InputSig3 {
       )
     or
     exists(CallExprImpl::DynamicCallExpr dce, TupleType tt, int i |
-      n1 = dce.getArgList() and
+      n2 = dce.getArgList() and
       tt.getArity() = dce.getNumberOfSyntacticArguments() and
-      n2 = dce.getSyntacticPositionalArgument(i) and
-      prefix1 = TypePath::singleton(tt.getPositionalTypeParameter(i)) and
-      prefix2.isEmpty()
+      n1 = dce.getSyntacticPositionalArgument(i) and
+      prefix2 = TypePath::singleton(tt.getPositionalTypeParameter(i)) and
+      prefix1.isEmpty()
     )
     or
     exists(ClosureExpr ce, int index |
-      n1 = ce and
-      n2 = ce.getParam(index).getPat() and
-      prefix1 = closureParameterPath(ce.getNumberOfParams(), index) and
-      prefix2.isEmpty()
+      n2 = ce and
+      n1 = ce.getParam(index).getPat() and
+      prefix2 = closureParameterPath(ce.getNumberOfParams(), index) and
+      prefix1.isEmpty()
     )
   }
 
@@ -536,11 +536,11 @@ private module Input3 implements InputSig3 {
     prefix1.isEmpty() and
     prefix2.isEmpty() and
     (
-      n1 = n2.(OrPat).getAPat()
+      n2 = n1.(OrPat).getAPat()
       or
-      n1 = n2.(ParenPat).getPat()
+      n2 = n1.(ParenPat).getPat()
       or
-      n1 = n2.(LiteralPat).getLiteral()
+      n2 = n1.(LiteralPat).getLiteral()
       or
       exists(BreakExpr break |
         break.getExpr() = n1 and
@@ -560,43 +560,46 @@ private module Input3 implements InputSig3 {
         prefix2 = TypePath::singleton(inferRefExprType(re).getPositionalTypeParameter(0))
       )
     or
-    n2 =
+    n1 =
       any(RefPat rp |
-        n1 = rp.getPat() and
-        prefix1.isEmpty() and
+        n2 = rp.getPat() and
+        prefix2.isEmpty() and
         exists(boolean isMutable | if rp.isMut() then isMutable = true else isMutable = false |
-          prefix2 = TypePath::singleton(getRefTypeParameter(isMutable))
+          prefix1 = TypePath::singleton(getRefTypeParameter(isMutable))
         )
       )
     or
-    exists(int i, int arity |
-      prefix1.isEmpty() and
-      prefix2 = TypePath::singleton(getTupleTypeParameter(arity, i))
+    exists(int i, int arity, TypePath prefix |
+      prefix = TypePath::singleton(getTupleTypeParameter(arity, i))
     |
       arity = n2.(TupleExpr).getNumberOfFields() and
-      n1 = n2.(TupleExpr).getField(i)
+      n1 = n2.(TupleExpr).getField(i) and
+      prefix1.isEmpty() and
+      prefix2 = prefix
       or
-      arity = n2.(TuplePat).getTupleArity() and
-      n1 = n2.(TuplePat).getField(i)
+      arity = n1.(TuplePat).getTupleArity() and
+      n2 = n1.(TuplePat).getField(i) and
+      prefix2.isEmpty() and
+      prefix1 = prefix
     )
     or
     exists(BlockExpr be |
-      n1 = be and
-      n2 = be.getStmtList().getTailExpr() and
+      n2 = be and
+      n1 = be.getStmtList().getTailExpr() and
       if be.isAsync()
       then
-        prefix1 = TypePath::singleton(getDynFutureOutputTypeParameter()) and
-        prefix2.isEmpty()
+        prefix2 = TypePath::singleton(getDynFutureOutputTypeParameter()) and
+        prefix1.isEmpty()
       else (
         prefix1.isEmpty() and
         prefix2.isEmpty()
       )
     )
     or
     // an array repeat expression (`[1; 3]`) has the type of the repeat operand
-    n1.(ArrayRepeatExpr).getRepeatOperand() = n2 and
-    prefix1 = TypePath::singleton(getArrayTypeParameter()) and
-    prefix2.isEmpty()
+    n2.(ArrayRepeatExpr).getRepeatOperand() = n1 and
+    prefix2 = TypePath::singleton(getArrayTypeParameter()) and
+    prefix1.isEmpty()
   }
 
   predicate inferStep(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
@@ -1853,6 +1856,14 @@ private module AssocFunctionResolution {
       )
     }
 
+    pragma[nomagic]
+    predicate resolutionDependsOnReturnType(DerefChain derefChain, BorrowKind borrow) {
+      exists(AssocFunctionCallCand afcc |
+        afcc = MkAssocFunctionCallCand(this, _, derefChain, borrow) and
+        afcc.resolutionDependsOnReturnType()
+      )
+    }
+
     /**
      * Holds if the argument `arg` of this call has been implicitly dereferenced
      * and borrowed according to `derefChain` and `borrow`, in order to be able to
@@ -2333,6 +2344,18 @@ private module AssocFunctionResolution {
       OverloadedCallArgsAreInstantiationsOf::argsAreInstantiationsOf(this, i, result)
     }
 
+    pragma[nomagic]
+    predicate resolutionDependsOnReturnType() {
+      exists(
+        ImplOrTraitItemNode i, AssocFunctionDeclaration target, TypeParameter tp,
+        FunctionPosition pos
+      |
+        target = this.resolveCallTargetCand(i) and
+        FunctionOverloading::functionResolutionDependsOnArgument(i, target, tp, pos) and
+        pos.isReturn()
+      )
+    }
+
     string toString() {
       result = afc_ + " at " + selfPos_ + " [" + derefChain.toString() + "; " + borrow + "]"
     }
@@ -2773,6 +2796,13 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
       |
         this.hasUnknownTypeAt(i, f, pos, path)
       )
+      or
+      exists(DerefChain derefChain, BorrowKind borrow |
+        super.resolutionDependsOnReturnType(derefChain, borrow) and
+        derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow) and
+        pos.isReturn() and
+        path.isEmpty()
+      )
     }
   }