more

Author: hvitved

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

@@ -775,11 +775,28 @@ private Type resolveTargetTyped(AstNode n, TypePath path) {
 }
 
 private module RecordFieldMatchingInput implements MatchingInputSig {
-  class Decl extends Struct {
-    // todo or variant
-    TypeParameter getTypeParameter(int i) {
+  abstract class Decl extends AstNode {
+    abstract TypeParameter getTypeParameter(int i);
+
+    abstract RecordField getField(string name);
+  }
+
+  private class StructDecl extends Decl, Struct {
+    override TypeParameter getTypeParameter(int i) {
       result.getTypeParam() = this.getGenericParamList().getTypeParam(i)
     }
+
+    override RecordField getField(string name) { result = this.getRecordField(name) }
+  }
+
+  private class VariantDecl extends Decl, Variant {
+    Enum getEnum() { result.getVariantList().getAVariant() = this }
+
+    override TypeParameter getTypeParameter(int i) {
+      result.getTypeParam() = this.getEnum().getGenericParamList().getTypeParam(i)
+    }
+
+    override RecordField getField(string name) { result = this.getRecordField(name) }
   }
 
   class Access extends RecordExpr {
@@ -834,7 +851,7 @@ private module RecordFieldMatchingInput implements MatchingInputSig {
   }
 
   predicate parameterType(Decl decl, Pos pos, TypePath path, Type t) {
-    exists(TypeRepr_ tp | tp = decl.getRecordField(pos).getTypeRepr() | t = tp.resolveTypeAt(path))
+    exists(TypeRepr_ tp | tp = decl.getField(pos).getTypeRepr() | t = tp.resolveTypeAt(path))
   }
 
   pragma[nomagic]

rust/ql/test/library-tests/type-inference/main.rs

@@ -227,7 +227,7 @@ mod m6 {
 
     pub fn f() {
         let x = MyEnum::C1(S1); // `MyEnum::C1(S1)` missing type at path 0
-        let y = MyEnum::C2 { a: S2 }; // `MyEnum::C2 { a: S2 }` missing type
+        let y = MyEnum::C2 { a: S2 }; // `MyEnum::C2 { a: S2 }` missing type at ""
 
         println!("{:?}", x.m1()); // `x.m1` missing type
         println!("{:?}", y.m1()); // `y`, `y.m1` missing type

rust/ql/test/library-tests/type-inference/type-inference.expected

@@ -160,8 +160,11 @@
 | main.rs:229:17:229:26 | ...::C1 |  | main.rs:208:5:212:5 | enum MyEnum |
 | main.rs:229:17:229:30 | ...::C1(...) |  | main.rs:208:5:212:5 | enum MyEnum |
 | main.rs:229:28:229:29 | S1 |  | main.rs:214:5:215:14 | struct S1 |
+| main.rs:230:13:230:13 | y | 0 | main.rs:216:5:217:14 | struct S2 |
+| main.rs:230:17:230:36 | ...::C2 {...} | 0 | main.rs:216:5:217:14 | struct S2 |
 | main.rs:230:33:230:34 | S2 |  | main.rs:216:5:217:14 | struct S2 |
 | main.rs:232:26:232:26 | x |  | main.rs:208:5:212:5 | enum MyEnum |
+| main.rs:233:26:233:26 | y | 0 | main.rs:216:5:217:14 | struct S2 |
 | main.rs:238:5:238:9 | ...::f |  | main.rs:2:5:2:21 | struct Foo |
 | main.rs:238:5:238:11 | ...::f(...) |  | main.rs:2:5:2:21 | struct Foo |
 | main.rs:239:5:239:9 | ...::g |  | main.rs:2:5:2:21 | struct Foo |