wip2

Author: hvitved

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

@@ -278,6 +278,14 @@ private module Input3 implements InputSig3 {
 
   class ParenExpr = Rust::ParenExpr;
 
+  final class Declaration = DeclarationImpl;
+
+  abstract private class DeclarationImpl extends AstNode {
+    abstract Type getDeclaringType(TypePath path);
+
+    abstract TypeMention getType();
+  }
+
   private newtype TLocalVariable =
     TVariableVariable(Rust::Variable v) or
     TConstVariable(Const c) or
@@ -316,14 +324,14 @@ private module Input3 implements InputSig3 {
     Location getLocation() { result = this.getDefiningNode().getLocation() }
   }
 
-  abstract class LocalVariableDeclaration extends AstNode {
+  abstract class LocalVariableDeclaration extends DeclarationImpl {
     abstract predicate isCoercionSite();
 
-    abstract TypeMention getType();
-
     abstract AstNode getPattern();
 
     abstract AstNode getInitializer();
+
+    override Type getDeclaringType(TypePath path) { none() }
   }
 
   private class LetExprDeclaration extends LocalVariableDeclaration instanceof LetExpr {
@@ -354,6 +362,71 @@ private module Input3 implements InputSig3 {
     override AstNode getInitializer() { result = LetStmt.super.getInitializer() }
   }
 
+  abstract class Field extends DeclarationImpl {
+    // no case for variants as those can only be destructured using pattern matching
+    abstract Struct getStruct();
+
+    override Type getDeclaringType(TypePath path) {
+      exists(Struct s | s = this.getStruct() |
+        result = TDataType(s) and
+        path.isEmpty()
+        or
+        result = TTypeParamTypeParameter(s.getGenericParamList().getATypeParam()) and
+        path = TypePath::singleton(result)
+      )
+    }
+  }
+
+  private class StructFieldDecl extends Field instanceof StructField {
+    override Struct getStruct() { this = result.getAStructField() }
+
+    override TypeMention getType() { result = StructField.super.getTypeRepr() }
+  }
+
+  private class TupleFieldDecl extends Field instanceof TupleField {
+    override Struct getStruct() { this = result.getATupleField() }
+
+    override TypeMention getType() { result = TupleField.super.getTypeRepr() }
+  }
+
+  class FieldAccess extends FieldExpr {
+    Expr getReceiver() { result = this.getContainer() }
+
+    Field getField() {
+      // mutual recursion; resolving fields requires resolving types and vice versa
+      result =
+        [
+          resolveStructFieldExpr(this, _).(AstNode),
+          resolveTupleFieldExpr(this, _)
+        ]
+    }
+  }
+
+  Type inferFieldAccessReceiverType(FieldAccess fa, TypePath path) {
+    exists(TypePath path0 | result = inferType(fa.getReceiver(), path0) |
+      // adjust for implicit deref
+      path0.isCons(getRefTypeParameter(_), path)
+      or
+      not path0.isCons(getRefTypeParameter(_), _) and
+      not (result instanceof RefType and path0.isEmpty()) and
+      path = path0
+    )
+  }
+
+  Type inferFieldAccessReceiverTypeContextual(Expr receiver, TypePath path) {
+    exists(TypePath path0, Type receiverType |
+      result = M3::inferFieldAccessReceiverTypeContextualDefault(_, receiver, path0) and
+      receiverType = inferType(receiver) and
+      not path0.isEmpty()
+    |
+      // adjust for implicit deref
+      path = TypePath::cons(receiverType.(RefType).getPositionalTypeParameter(0), path0)
+      or
+      not receiverType instanceof RefType and
+      path = path0
+    )
+  }
+
   final class Parameter = ParameterImpl;
 
   /** A parameter, including enum/struct constructor fields. */
@@ -389,19 +462,18 @@ private module Input3 implements InputSig3 {
 
   final class Parameterizable = ParameterizableImpl;
 
-  abstract private class ParameterizableImpl extends AstNode {
+  abstract private class ParameterizableImpl extends DeclarationImpl {
     abstract TypeParameter getTypeParameter(int pos);
 
     abstract TypeMention getAdditionalTypeParameterConstraint(TypeParameter tp);
 
     abstract TypeMention getDeclaringType();
 
-    // todo
-    Type getDeclaringType(TypePath path) { result = this.getDeclaringType().getTypeAt(path) }
+    final override Type getDeclaringType(TypePath path) {
+      result = this.getDeclaringType().getTypeAt(path)
+    }
 
     abstract Parameter getParameter(int i);
-
-    abstract TypeMention getType();
   }
 
   class Callable extends ParameterizableImpl instanceof Rust::Callable {
@@ -470,19 +542,17 @@ private module Input3 implements InputSig3 {
     }
   }
 
-  Type getParameterizableType(Parameterizable p, TypePath path) {
-    result = p.(Constructor).getType().getTypeAt(path)
-    or
-    if p.(Function).isAsync() or p.(ClosureExpr).isAsync()
+  Type getCallableReturnType(Callable c, TypePath path) {
+    if c.(Function).isAsync() or c.(ClosureExpr).isAsync()
     then
       path.isEmpty() and
       result = getFutureTraitType()
       or
       exists(TypePath suffix |
-        result = getReturnTypeMention(p).getTypeAt(suffix) and
+        result = getReturnTypeMention(c).getTypeAt(suffix) and
         path = TypePath::cons(getDynFutureOutputTypeParameter(), suffix)
       )
-    else result = getReturnTypeMention(p).getTypeAt(path)
+    else result = getReturnTypeMention(c).getTypeAt(path)
   }
 
   class ResolutionContext = string;
@@ -793,67 +863,6 @@ private module Input3 implements InputSig3 {
     )
   }
 
-  abstract class Member extends AstNode {
-    Type getDeclaringType(TypePath path) {
-      // no case for variants as those can only be destructured using pattern matching
-      exists(Struct s | this = [s.getStructField(_).(AstNode), s.getTupleField(_)] |
-        result = TDataType(s) and
-        path.isEmpty()
-        or
-        result = TTypeParamTypeParameter(s.getGenericParamList().getATypeParam()) and
-        path = TypePath::singleton(result)
-      )
-    }
-
-    abstract TypeMention getType();
-  }
-
-  private class StructFieldDecl extends Member instanceof StructField {
-    override TypeMention getType() { result = StructField.super.getTypeRepr() }
-  }
-
-  private class TupleFieldDecl extends Member instanceof TupleField {
-    override TypeMention getType() { result = TupleField.super.getTypeRepr() }
-  }
-
-  class MemberAccess extends FieldExpr {
-    AstNode getReceiver() { result = this.getContainer() }
-
-    Member getMember() {
-      // mutual recursion; resolving fields requires resolving types and vice versa
-      result =
-        [
-          resolveStructFieldExpr(this, _).(AstNode),
-          resolveTupleFieldExpr(this, _)
-        ]
-    }
-  }
-
-  Type inferMemberAccessReceiverType(MemberAccess ma, TypePath path) {
-    exists(TypePath path0 | result = inferType(ma.getReceiver(), path0) |
-      // adjust for implicit deref
-      path0.isCons(getRefTypeParameter(_), path)
-      or
-      not path0.isCons(getRefTypeParameter(_), _) and
-      not (result instanceof RefType and path0.isEmpty()) and
-      path = path0
-    )
-  }
-
-  Type inferMemberAccessReceiverTypeContextual(AstNode n, TypePath path) {
-    exists(TypePath path0, Type receiverType |
-      result = M3::inferMemberAccessReceiverTypeContextualDefault(_, n, path0) and
-      receiverType = inferType(n) and
-      not path0.isEmpty()
-    |
-      // adjust for implicit deref
-      path = TypePath::cons(receiverType.(RefType).getPositionalTypeParameter(0), path0)
-      or
-      not receiverType instanceof RefType and
-      path = path0
-    )
-  }
-
   class Closure extends Expr, Callable instanceof Rust::ClosureExpr { }
 
   class ClosureParameterPseudoType = T::ClosureParameterPseudoType;
@@ -3001,7 +3010,7 @@ private module DeconstructionPatMatchingInput implements MatchingInputSig {
       result = this.getParameter(pos.asPosition()).getType().getTypeAt(path)
       or
       pos.isReturn() and
-      result = Input3::getParameterizableType(this, path)
+      result = this.getType().getTypeAt(path)
     }
   }