wip

Author: hvitved

rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll

@@ -239,9 +239,8 @@ final class RecordExprCfgNode extends Nodes::RecordExprCfgNode {
   pragma[nomagic]
   ExprCfgNode getFieldExpr(string field) {
     exists(RecordExprField ref |
-      ref = node.getRecordExprFieldList().getAField() and
-      any(ChildMapping mapping).hasCfgChild(node, ref.getExpr(), this, result) and
-      field = ref.getFieldName()
+      ref = node.getFieldExpr(field) and
+      any(ChildMapping mapping).hasCfgChild(node, ref.getExpr(), this, result)
     )
   }
 }

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

@@ -11,6 +11,8 @@ private import codeql.rust.elements.internal.generated.GenericArgList
  * be referenced directly.
  */
 module Impl {
+  private import rust
+
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * The base class for generic arguments.
@@ -22,5 +24,15 @@ module Impl {
     override string toString() { result = this.toAbbreviatedString() }
 
     override string toAbbreviatedString() { result = "<...>" }
+
+    /** Gets the `i`th type argument. */
+    TypeRepr getTypeArgument(int i) {
+      result =
+        rank[i + 1](TypeRepr res, int j |
+          res = this.getGenericArg(j).(TypeArg).getTypeRepr()
+        |
+          res order by j
+        )
+    }
   }
 }

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

@@ -27,6 +27,13 @@ module Impl {
   class RecordExpr extends Generated::RecordExpr {
     override string toString() { result = this.getPath().toString() + " {...}" }
 
+    /** Gets the record expression for the field `field`. */
+    pragma[nomagic]
+    RecordExprField getFieldExpr(string name) {
+      result = this.getRecordExprFieldList().getAField() and
+      name = result.getFieldName()
+    }
+
     /** Gets the record field that matches the `name` field of this record expression. */
     pragma[nomagic]
     RecordField getRecordField(string name) {