wip12

Author: hvitved

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

@@ -14,7 +14,6 @@ private import FunctionType
 private import FunctionOverloading as FunctionOverloading
 private import BlanketImplementation as BlanketImplementation
 private import codeql.rust.elements.internal.VariableImpl::Impl as VariableImpl
-private import codeql.rust.internal.CachedStages
 private import codeql.typeinference.internal.TypeInference
 private import codeql.rust.frameworks.stdlib.Stdlib
 private import codeql.rust.frameworks.stdlib.Builtins as Builtins
@@ -394,13 +393,7 @@ private module Input3 implements InputSig3 {
     }
   }
 
-  class Call extends Expr instanceof FunctionCallMatchingInput::Access {
-    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-      result = super.getTypeArgument(apos, path)
-    }
-
-    AstNode getNodeAt(TypePosition pos) { result = super.getNodeAt(pos) }
-
+  class Call extends FunctionCallMatchingInput::Access {
     /** Gets the target of this call. */
     Callable getTargetCertain() {
       exists(ImplOrTraitItemNodeOption i, FunctionDeclaration f, Path p |
@@ -421,7 +414,7 @@ private module Input3 implements InputSig3 {
 
   Type inferCallReturnType(AstNode n, TypePath path) {
     exists(Call call, TypePath path0 |
-      result = inferCallReturnType(call, _, n, path0) and
+      result = M3::inferCallReturnType(call, _, n, path0) and
       if
         // index expression `x[i]` desugars to `*x.index(i)`, so we must account for
         // the implicit deref
@@ -598,11 +591,15 @@ private module Input3 implements InputSig3 {
   predicate inferLubStep(AstNode n1, TypePath path1, AstNode n2, TypePath path2) {
     path1.isEmpty() and
     (
-      n2 = any(ArrayListExpr ale | n1 = ale.getAnExpr()) and
+      n2 = n1.(ArrayListExpr).getAnExpr() and
       path2 = TypePath::singleton(getArrayTypeParameter())
       or
-      bodyReturns(n2, n1) and
-      path2.isEmpty()
+      exists(ReturnExpr re, Rust::Callable c |
+        n1 = re.getExpr() and
+        c = re.getEnclosingCallable() and
+        n2 = c.getBody() and
+        path2.isEmpty()
+      )
       or
       exists(Struct s |
         n1 = [n2.(RangeExpr).getStart(), n2.(RangeExpr).getEnd()] and
@@ -617,14 +614,22 @@ private module Input3 implements InputSig3 {
     result = inferTypeFromAnnotationTopDown(n, path)
     or
     result = inferClosureExprBodyTypeTopDown(n, path)
+    or
+    exists(FunctionPosition pos | not pos.isReturn() |
+      result = inferConstructionType(n, pos, path)
+      or
+      result = inferOperationType(n, pos, path)
+    )
   }
 
   Type inferTypeSpecific(AstNode n, TypePath path) {
     result = inferAssignmentOperationType(n, path)
     or
-    result = inferConstructionType(n, path)
-    or
-    result = inferOperationType(n, path)
+    exists(FunctionPosition pos | pos.isReturn() |
+      result = inferConstructionType(n, pos, path)
+      or
+      result = inferOperationType(n, pos, path)
+    )
     or
     result = inferFieldExprType(n, path)
     or
@@ -650,7 +655,12 @@ private module Input3 implements InputSig3 {
 
 private module M3 = Make3<Input3>;
 
-import M3
+// import M3
+predicate inferType = M3::inferType/1;
+
+predicate inferType = M3::inferType/2;
+
+predicate inferTypeCertain = M3::inferTypeCertain/2;
 
 module Consistency {
   import M2::Consistency
@@ -917,14 +927,6 @@ private Struct getRangeType(RangeExpr re) {
   result instanceof RangeToInclusiveStruct
 }
 
-private predicate bodyReturns(Expr body, Expr e) {
-  exists(ReturnExpr re, Callable c |
-    e = re.getExpr() and
-    c = re.getEnclosingCallable() and
-    body = c.getBody()
-  )
-}
-
 pragma[nomagic]
 private Type inferTypeFromAnnotationTopDown(AstNode n, TypePath path) {
   // Normally, these are coercion sites, but in case a type is unknown we
@@ -1082,7 +1084,7 @@ private module ContextTyping {
    * context in which the call appears, for example a call like
    * `Default::default()`.
    */
-  abstract class ContextTypedCallCand extends AstNode {
+  abstract class ContextTypedCallCand extends Expr {
     abstract Type getTypeArgument(TypeArgumentPosition apos, TypePath path);
 
     predicate hasTypeArgument(TypeArgumentPosition apos) { exists(this.getTypeArgument(apos, _)) }
@@ -2653,7 +2655,9 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
     )
   }
 
-  abstract class Access extends ContextTyping::ContextTypedCallCand {
+  final class Access = AccessImpl;
+
+  abstract private class AccessImpl extends ContextTyping::ContextTypedCallCand {
     abstract AstNode getNodeAt(FunctionPosition pos);
 
     bindingset[derefChainBorrow]
@@ -2668,7 +2672,7 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
     abstract predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path);
   }
 
-  private class AssocFunctionCallAccess extends Access instanceof AssocFunctionResolution::AssocFunctionCall
+  private class AssocFunctionCallAccess extends AccessImpl instanceof AssocFunctionResolution::AssocFunctionCall
   {
     AssocFunctionCallAccess() {
       // handled in the `OperationMatchingInput` module
@@ -2755,7 +2759,7 @@ private module FunctionCallMatchingInput implements MatchingWithEnvironmentInput
     }
   }
 
-  private class NonAssocFunctionCallAccess extends Access instanceof NonAssocCallExpr,
+  private class NonAssocFunctionCallAccess extends AccessImpl instanceof NonAssocCallExpr,
     CallExprImpl::CallExprCall
   {
     pragma[nomagic]
@@ -2815,7 +2819,7 @@ private Type inferCallArgumentTypeTopDown(
 ) {
   exists(string derefChainBorrow |
     FunctionCallMatchingInput::decodeDerefChainBorrow(derefChainBorrow, derefChain, borrow) and
-    result = inferCallArgumentTypeTopDown(call, derefChainBorrow, pos, n, path)
+    result = M3::inferCallArgumentTypeTopDown(call, derefChainBorrow, pos, n, path)
   )
 }
 
@@ -3024,16 +3028,13 @@ private module ConstructionMatchingInput implements MatchingInputSig {
 private module ConstructionMatching = Matching<ConstructionMatchingInput>;
 
 pragma[nomagic]
-private Type inferConstructionTypePreCheck(AstNode n, FunctionPosition pos, TypePath path) {
+private Type inferConstructionType(AstNode n, FunctionPosition pos, TypePath path) {
   exists(ConstructionMatchingInput::Access a |
     n = a.getNodeAt(pos) and
     result = ConstructionMatching::inferAccessType(a, pos, path)
   )
 }
 
-private predicate inferConstructionType =
-  CheckContextTyping<inferConstructionTypePreCheck/3>::check/2;
-
 pragma[nomagic]
 private Type inferUnknownType(AstNode n, TypePath path) {
   result = TUnknownType() and
@@ -3119,16 +3120,14 @@ private module OperationMatchingInput implements MatchingInputSig {
 private module OperationMatching = Matching<OperationMatchingInput>;
 
 pragma[nomagic]
-private Type inferOperationTypePreCheck(AstNode n, FunctionPosition pos, TypePath path) {
+private Type inferOperationType(AstNode n, FunctionPosition pos, TypePath path) {
   exists(OperationMatchingInput::Access a |
     n = a.getNodeAt(pos) and
     result = OperationMatching::inferAccessType(a, pos, path) and
     if pos.asPosition() = 0 then not path.isEmpty() else any()
   )
 }
 
-private predicate inferOperationType = CheckContextTyping<inferOperationTypePreCheck/3>::check/2;
-
 pragma[nomagic]
 private Type getFieldExprLookupType(FieldExpr fe, string name, DerefChain derefChain) {
   exists(TypePath path |
@@ -3153,6 +3152,7 @@ private Type getFieldExprLookupType(FieldExpr fe, string name, DerefChain derefC
  */
 cached
 StructField resolveStructFieldExpr(FieldExpr fe, DerefChain derefChain) {
+  M3::CachedStage::ref() and
   exists(string name, DataType ty |
     ty = getFieldExprLookupType(fe, pragma[only_bind_into](name), derefChain)
   |
@@ -3174,6 +3174,7 @@ private Type getTupleFieldExprLookupType(FieldExpr fe, int pos, DerefChain deref
  */
 cached
 TupleField resolveTupleFieldExpr(FieldExpr fe, DerefChain derefChain) {
+  M3::CachedStage::ref() and
   exists(int i |
     result =
       getTupleFieldExprLookupType(fe, pragma[only_bind_into](i), derefChain)
@@ -3664,7 +3665,7 @@ private Type inferCastExprType(CastExpr ce, TypePath path) {
 /** Holds if `n` is implicitly dereferenced and/or borrowed. */
 cached
 predicate implicitDerefChainBorrow(Expr e, DerefChain derefChain, boolean borrow) {
-  CachedStage::ref() and
+  M3::CachedStage::ref() and
   exists(BorrowKind bk |
     any(AssocFunctionResolution::AssocFunctionCall afc)
         .argumentHasImplicitDerefChainBorrow(e, derefChain, bk) and
@@ -3691,6 +3692,7 @@ predicate implicitDerefChainBorrow(Expr e, DerefChain derefChain, boolean borrow
  */
 cached
 Addressable resolveCallTarget(InvocationExpr call, boolean dispatch) {
+  M3::CachedStage::ref() and
   dispatch = false and
   result = call.(NonAssocCallExpr).resolveCallTargetViaPathResolution()
   or
@@ -3711,7 +3713,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 = 1102
+      startline = 103
     )
   }
 
@@ -3737,24 +3739,11 @@ private module Debug {
     t = self.getTypeAt(path)
   }
 
-  // predicate debugInferFunctionCallType(AstNode n, TypePath path, Type t) {
-  //   n = getRelevantLocatable() and
-  //   t = inferFunctionCallType(n, path)
-  // }
-  predicate debugInferConstructionType(AstNode n, TypePath path, Type t) {
-    n = getRelevantLocatable() and
-    t = inferConstructionType(n, path)
-  }
-
   predicate debugTypeMention(TypeMention tm, TypePath path, Type type) {
     tm = getRelevantLocatable() and
     tm.getTypeAt(path) = type
   }
 
-  // Type debugInferAnnotatedType(AstNode n, TypePath path) {
-  //   n = getRelevantLocatable() and
-  //   result = inferAnnotatedType(n, path)
-  // }
   pragma[nomagic]
   private int countTypesAtPath(AstNode n, TypePath path, Type t) {
     t = inferType(n, path) and
@@ -3803,7 +3792,7 @@ private module Debug {
     c = max(countTypePaths(_, _, _))
   }
 
-  Type debuginferTypeCertain(AstNode n, TypePath path) {
+  Type debugInferTypeCertain(AstNode n, TypePath path) {
     n = getRelevantLocatable() and
     result = inferTypeCertain(n, path)
   }