wip

Author: hvitved

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

@@ -268,11 +268,11 @@ private predicate isPanicMacroCall(MacroExpr me) {
   me.getMacroCall().resolveMacro().(MacroRules).getName().getText() = "panic"
 }
 
-Type inferCertainStructExprType(StructExpr se, TypePath path) {
+private Type inferStructExprType(StructExpr se, TypePath path) {
   result = se.getPath().(TypeMention).getTypeAt(path)
 }
 
-Type inferCertainStructPatType(StructPat sp, TypePath path) {
+private Type inferStructPatType(StructPat sp, TypePath path) {
   result = sp.getPath().(TypeMention).getTypeAt(path)
 }
 
@@ -1904,18 +1904,6 @@ private Type inferRefPatType(AstNode ref) {
   )
 }
 
-pragma[nomagic]
-private Type inferTryExprType(TryExpr te, TypePath path) {
-  exists(TypeParam tp, TypePath path0 |
-    result = inferType(te.getExpr(), path0) and
-    path0.isCons(TTypeParamTypeParameter(tp), path)
-  |
-    tp = any(ResultEnum r).getGenericParamList().getGenericParam(0)
-    or
-    tp = any(OptionEnum o).getGenericParamList().getGenericParam(0)
-  )
-}
-
 pragma[nomagic]
 private StructType getStrStruct() { result = TDataType(any(Builtins::Str s)) }
 
@@ -2241,7 +2229,6 @@ TupleField resolveTupleFieldExpr(FieldExpr fe, DerefChain derefChain) {
 
 private module Input3 implements InputSig3 {
   private import rust as Rust
-  private import codeql.rust.elements.internal.OperationImpl::Impl as OperationImpl
 
   predicate cacheRevRef() {
     (implicitDerefChainBorrow(_, _, _) implies any())
@@ -2305,9 +2292,11 @@ private module Input3 implements InputSig3 {
 
   class LogicalOrExpr extends BinaryExpr, Rust::LogicalOrExpr { }
 
-  abstract class Assignment extends BinaryExpr { }
+  final class Assignment = AssignmentImpl;
 
-  class AssignExpr extends Assignment, Rust::AssignmentExpr { }
+  abstract private class AssignmentImpl extends BinaryExpr { }
+
+  class AssignExpr extends AssignmentImpl, Rust::AssignmentExpr { }
 
   class ParenExpr extends Expr instanceof Rust::ParenExpr {
     Expr getExpr() { result = super.getExpr() }
@@ -2353,7 +2342,9 @@ private module Input3 implements InputSig3 {
     Location getLocation() { result = this.getDefiningNode().getLocation() }
   }
 
-  abstract class VariableDeclaration extends DeclarationImpl {
+  final class VariableDeclaration = VariableDeclarationImpl;
+
+  abstract private class VariableDeclarationImpl extends DeclarationImpl {
     abstract predicate isCoercionSite();
 
     abstract AstNode getPattern();
@@ -2363,7 +2354,7 @@ private module Input3 implements InputSig3 {
     override TypeMention getDeclaringType() { none() }
   }
 
-  private class LetExprDeclaration extends VariableDeclaration instanceof LetExpr {
+  private class LetExprDeclaration extends VariableDeclarationImpl instanceof LetExpr {
     override predicate isCoercionSite() { not super.getPat() instanceof IdentPat }
 
     override TypeMention getType() { none() }
@@ -2373,15 +2364,15 @@ private module Input3 implements InputSig3 {
     override AstNode getInitializer() { result = super.getScrutinee() }
   }
 
-  private class LetStmtDeclaration extends VariableDeclaration instanceof LetStmt {
+  private class LetStmtDeclaration extends VariableDeclarationImpl instanceof LetStmt {
     override predicate isCoercionSite() {
       super.hasTypeRepr()
       or
       // Due to "binding modes" the type of the pattern is not necessarily the
       // same as the type of the initializer. However, when the pattern is an
       // identifier pattern, its type is guaranteed to be the same as the type of the
       // initializer.
-      not this.getPattern() instanceof IdentPat
+      not super.getPat() instanceof IdentPat
     }
 
     override TypeMention getType() { result = super.getTypeRepr() }
@@ -2391,7 +2382,7 @@ private module Input3 implements InputSig3 {
     override AstNode getInitializer() { result = LetStmt.super.getInitializer() }
   }
 
-  private class ConstDeclaration extends VariableDeclaration instanceof Const {
+  private class ConstDeclaration extends VariableDeclarationImpl instanceof Const {
     override predicate isCoercionSite() { any() }
 
     override TypeMention getType() { result = super.getTypeRepr() }
@@ -2401,7 +2392,7 @@ private module Input3 implements InputSig3 {
     override AstNode getInitializer() { result = super.getBody() }
   }
 
-  private class StaticDeclaration extends VariableDeclaration instanceof Static {
+  private class StaticDeclaration extends VariableDeclarationImpl instanceof Static {
     override predicate isCoercionSite() { any() }
 
     override TypeMention getType() { result = super.getTypeRepr() }
@@ -2411,20 +2402,22 @@ private module Input3 implements InputSig3 {
     override AstNode getInitializer() { result = super.getBody() }
   }
 
-  abstract class Field extends DeclarationImpl {
+  final class Field = FieldImpl;
+
+  abstract private class FieldImpl extends DeclarationImpl {
     // no case for variants as those can only be destructured using pattern matching
     abstract Struct getStruct();
 
     override TypeMention getDeclaringType() { result = this.getStruct() }
   }
 
-  private class StructFieldDecl extends Field instanceof StructField {
+  private class StructFieldDecl extends FieldImpl instanceof StructField {
     override Struct getStruct() { this = result.getAStructField() }
 
     override TypeMention getType() { result = StructField.super.getTypeRepr() }
   }
 
-  private class TupleFieldDecl extends Field instanceof TupleField {
+  private class TupleFieldDecl extends FieldImpl instanceof TupleField {
     override Struct getStruct() { this = result.getATupleField() }
 
     override TypeMention getType() { result = TupleField.super.getTypeRepr() }
@@ -2470,9 +2463,8 @@ private module Input3 implements InputSig3 {
 
   final class Parameter = ParameterImpl;
 
-  /** A parameter, including enum/struct constructor fields. */
-  abstract private class ParameterImpl extends VariableDeclaration {
-    override predicate isCoercionSite() { any() } // doesn't really matter, since there are no initializers
+  abstract private class ParameterImpl extends VariableDeclarationImpl {
+    override predicate isCoercionSite() { any() } // doesn't really matter, since there are no initializers/default values
 
     override AstNode getInitializer() { none() }
   }
@@ -2552,8 +2544,7 @@ private module Input3 implements InputSig3 {
     override TypeMention getAdditionalTypeParameterConstraint(TypeParameter tp) { none() }
 
     override TypeParameter getTypeParameter(int pos) {
-      result.(TypeParamTypeParameter).getTypeParam() =
-        this.getTypeItem().getGenericParamList().getTypeParam(pos)
+      result = TTypeParamTypeParameter(this.getTypeItem().getGenericParamList().getTypeParam(pos))
     }
 
     override TypeMention getType() { result = this.getTypeItem() }
@@ -2644,10 +2635,10 @@ private module Input3 implements InputSig3 {
 
     pragma[nomagic]
     override Type getTypeArgument(int pos, TypePath path) {
+      result = getCallExprTypeArgument(this, pos, path)
+      or
       result =
         this.(MethodCallExpr).getGenericArgList().getTypeArg(pos).(TypeMention).getTypeAt(path)
-      or
-      result = getCallExprTypeArgument(this, pos, path)
     }
 
     override Expr getArgument(int i) {
@@ -2769,14 +2760,7 @@ private module Input3 implements InputSig3 {
   }
 
   pragma[nomagic]
-  private Type inferInvocationArgumentType0(Invocation invocation, int pos, TypePath path) {
-    exists(FunctionPosition fpos |
-      pos = fpos.asPosition() and
-      result =
-        invocation.(AssocFunctionResolution::OperationAssocFunctionCall).getTypeAt(fpos, path)
-    )
-    or
-    not invocation instanceof Operation and
+  private Type inferNonAssocFunctionCallArgumentType(Invocation invocation, int pos, TypePath path) {
     not invocation instanceof AssocFunctionCall and
     result = inferType(invocation.getArgument(pos), path)
   }
@@ -2785,7 +2769,7 @@ private module Input3 implements InputSig3 {
   Type inferInvocationArgumentType(
     Invocation invocation, string derefChainBorrow, int pos, TypePath path
   ) {
-    result = inferInvocationArgumentType0(invocation, pos, path)
+    result = inferNonAssocFunctionCallArgumentType(invocation, pos, path)
     or
     invocation =
       any(AssocFunctionCall afc |
@@ -2892,7 +2876,7 @@ private module Input3 implements InputSig3 {
       // index expression `x[i]` desugars to `*x.index(i)`, so we must account for
       // the implicit deref
       if invocation instanceof IndexExpr or invocation instanceof DerefExpr
-      then path0.isCons(getRefTypeParameter(_), path)
+      then path = TypePath::cons(getRefTypeParameter(_), path0)
       else path = path0
     )
   }
@@ -2988,9 +2972,11 @@ private module Input3 implements InputSig3 {
     result = inferRefExprType(n) and
     path.isEmpty()
     or
-    result = inferCertainStructExprType(n, path)
+    result = inferStructExprType(n, path)
     or
-    result = inferCertainStructPatType(n, path)
+    result = inferStructPatType(n, path)
+    or
+    result = inferAssignmentOperationType(n, path)
     or
     result = inferRangeExprType(n) and
     path.isEmpty()
@@ -3003,6 +2989,8 @@ private module Input3 implements InputSig3 {
     result = inferArrayExprType(n) and
     path.isEmpty()
     or
+    result = inferArgList(n, path)
+    or
     exprHasUnitType(n) and
     path.isEmpty() and
     result instanceof UnitType
@@ -3095,6 +3083,17 @@ private module Input3 implements InputSig3 {
       prefix2.isEmpty() and
       prefix1 = path
     )
+    or
+    exists(TypeParam tp, Enum e |
+      n1 = n2.(TryExpr).getExpr() and
+      tp = e.getGenericParamList().getGenericParam(0) and
+      prefix1 = TypePath::singleton(TTypeParamTypeParameter(tp)) and
+      prefix2.isEmpty()
+    |
+      e instanceof ResultEnum
+      or
+      e instanceof OptionEnum
+    )
   }
 
   pragma[nomagic]
@@ -3110,18 +3109,12 @@ private module Input3 implements InputSig3 {
 
   pragma[nomagic]
   Type inferTypeSpecific(AstNode n, TypePath path) {
-    result = inferAssignmentOperationType(n, path)
-    or
-    result = inferTryExprType(n, path)
-    or
     result = inferLiteralType(n, path, false)
     or
     result = inferAwaitExprType(n, path)
     or
     result = inferForLoopExprType(n, path)
     or
-    result = inferArgList(n, path)
-    or
     result = inferDeconstructionPatType(n, path)
     or
     result = inferUnknownType(n, path)