wip

Author: hvitved

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

@@ -367,7 +367,7 @@ private module Input3 implements InputSig3 {
   }
 
   private class ConstDeclaration extends VariableDeclaration instanceof Const {
-    override predicate isCoercionSite() { none() }
+    override predicate isCoercionSite() { any() }
 
     override TypeMention getType() { result = super.getTypeRepr() }
 
@@ -377,7 +377,7 @@ private module Input3 implements InputSig3 {
   }
 
   private class StaticDeclaration extends VariableDeclaration instanceof Static {
-    override predicate isCoercionSite() { none() }
+    override predicate isCoercionSite() { any() }
 
     override TypeMention getType() { result = super.getTypeRepr() }
 
@@ -454,10 +454,10 @@ private module Input3 implements InputSig3 {
   final class Parameter = ParameterImpl;
 
   /** A parameter, including enum/struct constructor fields. */
-  abstract private class ParameterImpl extends AstNode {
-    abstract AstNode getPattern();
+  abstract private class ParameterImpl extends VariableDeclaration {
+    override predicate isCoercionSite() { any() } // doesn't really matter, since there are no initializers
 
-    abstract TypeMention getType();
+    override AstNode getInitializer() { none() }
   }
 
   private class SelfParamParameter extends ParameterImpl, SelfParam {
@@ -941,25 +941,25 @@ private module Input3 implements InputSig3 {
     exists(c)
   }
 
-  predicate inferStepCertain(AstNode n1, TypePath path1, AstNode n2, TypePath path2) {
+  predicate inferStepCertain(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
     n1 =
       any(IdentPat ip |
         n2 = ip.getName() and
-        path1.isEmpty() and
+        prefix1.isEmpty() and
         if ip.isRef()
         then
           exists(boolean isMutable | if ip.isMut() then isMutable = true else isMutable = false |
-            path2 = TypePath::singleton(getRefTypeParameter(isMutable))
+            prefix2 = TypePath::singleton(getRefTypeParameter(isMutable))
           )
-        else path2.isEmpty()
+        else prefix2.isEmpty()
       )
     or
     exists(CallExprImpl::DynamicCallExpr dce, TupleType tt, int i |
       n1 = dce.getSyntacticPositionalArgument(i) and
       n2 = dce.getArgList() and
       tt.getArity() = dce.getNumberOfSyntacticArguments() and
-      path1.isEmpty() and
-      path2 = TypePath::singleton(tt.getPositionalTypeParameter(i))
+      prefix1.isEmpty() and
+      prefix2 = TypePath::singleton(tt.getPositionalTypeParameter(i))
     )
   }
 
@@ -1001,44 +1001,44 @@ private module Input3 implements InputSig3 {
     result = inferClosureArgsType(n, path)
   }
 
-  predicate inferStep(AstNode n1, TypePath path1, AstNode n2, TypePath path2) {
+  predicate inferStep(AstNode n1, TypePath prefix1, AstNode n2, TypePath prefix2) {
     // When `n2` is `*n1` propagate type information from a raw pointer type
     // parameter at `n1` (all other deref expressions are handled as calls)
     n1 = n2.(DerefExpr).getExpr() and
-    path1 = TypePath::singleton(getPtrTypeParameter()) and
-    path2.isEmpty()
+    prefix1 = TypePath::singleton(getPtrTypeParameter()) and
+    prefix2.isEmpty()
     or
-    path1.isEmpty() and
+    prefix1.isEmpty() and
     (
       n1 = n2.(ArrayListExpr).getAnExpr() and
-      path2 = TypePath::singleton(getArrayTypeParameter())
+      prefix2 = TypePath::singleton(getArrayTypeParameter())
       or
       exists(Struct s |
         n1 = [n2.(RangeExpr).getStart(), n2.(RangeExpr).getEnd()] and
-        path2 =
+        prefix2 =
           TypePath::singleton(TTypeParamTypeParameter(s.getGenericParamList().getATypeParam())) and
         s = getRangeType(n2)
       )
       or
       n2 =
         any(RefExpr re |
           n1 = re.getExpr() and
-          path2 = TypePath::singleton(inferRefExprType(re).getPositionalTypeParameter(0))
+          prefix2 = TypePath::singleton(inferRefExprType(re).getPositionalTypeParameter(0))
         )
       or
       exists(BlockExpr be |
         n2 = be and
         n1 = be.getStmtList().getTailExpr() and
         if be.isAsync()
-        then path2 = TypePath::singleton(getDynFutureOutputTypeParameter())
-        else path2.isEmpty()
+        then prefix2 = TypePath::singleton(getDynFutureOutputTypeParameter())
+        else prefix2.isEmpty()
       )
       or
       // an array repeat expression (`[1; 3]`) has the type of the repeat operand
       n2.(ArrayRepeatExpr).getRepeatOperand() = n1 and
-      path2 = TypePath::singleton(getArrayTypeParameter())
+      prefix2 = TypePath::singleton(getArrayTypeParameter())
       or
-      path2.isEmpty() and
+      prefix2.isEmpty() and
       (
         exists(ReturnExpr re, Rust::Callable c |
           n1 = re.getExpr() and
@@ -1067,9 +1067,9 @@ private module Input3 implements InputSig3 {
     n1 =
       any(RefPat rp |
         n2 = rp.getPat() and
-        path2.isEmpty() and
+        prefix2.isEmpty() and
         exists(boolean isMutable | if rp.isMut() then isMutable = true else isMutable = false |
-          path1 = TypePath::singleton(getRefTypeParameter(isMutable))
+          prefix1 = TypePath::singleton(getRefTypeParameter(isMutable))
         )
       )
     or
@@ -1078,13 +1078,13 @@ private module Input3 implements InputSig3 {
     |
       arity = n2.(TupleExpr).getNumberOfFields() and
       n1 = n2.(TupleExpr).getField(i) and
-      path1.isEmpty() and
-      path2 = path
+      prefix1.isEmpty() and
+      prefix2 = path
       or
       arity = n1.(TuplePat).getTupleArity() and
       n2 = n1.(TuplePat).getField(i) and
-      path2.isEmpty() and
-      path1 = path
+      prefix2.isEmpty() and
+      prefix1 = path
     )
   }