wip8

Author: hvitved

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

@@ -312,6 +312,18 @@ private module Input3 implements InputSig3 {
 
   class Expr = Rust::Expr;
 
+  class SwitchExpr extends Rust::MatchExpr {
+    Expr getExpr() { result = this.getScrutinee() }
+
+    Case getCase(int index) { result = this.getArm(index) }
+  }
+
+  class Case extends Rust::MatchArm {
+    AstNode getAPattern() { result = this.getPat() }
+
+    Expr getBody() { result = this.getExpr() }
+  }
+
   class ConditionalExpr extends IfExpr {
     Expr getThen() { result = super.getThen() }
   }
@@ -447,7 +459,46 @@ private module Input3 implements InputSig3 {
     )
   }
 
-  predicate inferCertainTypeInput = CertainTypeInferenceInput::inferCertainTypeInput/2;
+  Type inferCertainTypeInput(AstNode n, TypePath path) {
+    result = inferFunctionBodyType(n, path)
+    or
+    result = inferLiteralType(n, path, true)
+    or
+    result = inferRefPatType(n) and
+    path.isEmpty()
+    or
+    result = inferRefExprType(n) and
+    path.isEmpty()
+    or
+    result = inferCertainStructExprType(n, path)
+    or
+    result = inferCertainStructPatType(n, path)
+    or
+    result = inferRangeExprType(n) and
+    path.isEmpty()
+    or
+    result = inferTupleRootType(n) and
+    path.isEmpty()
+    or
+    result = inferBlockExprType(n, path)
+    or
+    result = inferArrayExprType(n) and
+    path.isEmpty()
+    or
+    result = inferCastExprType(n, path)
+    or
+    exprHasUnitType(n) and
+    path.isEmpty() and
+    result instanceof UnitType
+    or
+    isPanicMacroCall(n) and
+    path.isEmpty() and
+    result instanceof NeverType
+    or
+    n instanceof ClosureExpr and
+    path.isEmpty() and
+    result = closureRootType()
+  }
 
   predicate typeEqualityInput(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
     prefix1.isEmpty() and
@@ -828,60 +879,12 @@ private TypePath closureParameterPath(int arity, int index) {
       TypePath::singleton(getTupleTypeParameter(arity, index)))
 }
 
-/** Module for inferring certain type information. */
-private module CertainTypeInferenceInput {
-  private Type inferCertainStructExprType(StructExpr se, TypePath path) {
-    result = se.getPath().(TypeMention).getTypeAt(path)
-  }
-
-  private Type inferCertainStructPatType(StructPat sp, TypePath path) {
-    result = sp.getPath().(TypeMention).getTypeAt(path)
-  }
+private Type inferCertainStructExprType(StructExpr se, TypePath path) {
+  result = se.getPath().(TypeMention).getTypeAt(path)
+}
 
-  /**
-   * Holds if `n` has complete and certain type information and if `n` has the
-   * resulting type at `path`.
-   */
-  Type inferCertainTypeInput(AstNode n, TypePath path) {
-    result = inferFunctionBodyType(n, path)
-    or
-    result = inferLiteralType(n, path, true)
-    or
-    result = inferRefPatType(n) and
-    path.isEmpty()
-    or
-    result = inferRefExprType(n) and
-    path.isEmpty()
-    or
-    result = inferCertainStructExprType(n, path)
-    or
-    result = inferCertainStructPatType(n, path)
-    or
-    result = inferRangeExprType(n) and
-    path.isEmpty()
-    or
-    result = inferTupleRootType(n) and
-    path.isEmpty()
-    or
-    result = inferBlockExprType(n, path)
-    or
-    result = inferArrayExprType(n) and
-    path.isEmpty()
-    or
-    result = inferCastExprType(n, path)
-    or
-    exprHasUnitType(n) and
-    path.isEmpty() and
-    result instanceof UnitType
-    or
-    isPanicMacroCall(n) and
-    path.isEmpty() and
-    result instanceof NeverType
-    or
-    n instanceof ClosureExpr and
-    path.isEmpty() and
-    result = closureRootType()
-  }
+private Type inferCertainStructPatType(StructPat sp, TypePath path) {
+  result = sp.getPath().(TypeMention).getTypeAt(path)
 }
 
 private Type inferAssignmentOperationType(AstNode n, TypePath path) {

shared/typeinference/codeql/typeinference/internal/TypeInference.qll

@@ -2149,6 +2149,28 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
       /** An expression. */
       class Expr extends AstNode;
 
+      /**
+       * A switch expression.
+       */
+      class SwitchExpr extends Expr {
+        /**
+         * Gets the expression being switched on.
+         */
+        Expr getExpr();
+
+        /** Gets the case at the specified (zero-based) `index`. */
+        Case getCase(int index);
+      }
+
+      /** A case in a switch expression. */
+      class Case extends AstNode {
+        /** Gets a pattern being matched by this case. */
+        AstNode getAPattern();
+
+        /** Gets the body of this case. */
+        Expr getBody();
+      }
+
       /** A ternary conditional expression. */
       class ConditionalExpr extends Expr {
         /** Gets the condition of this expression. */