Rust: Shorthand record construction in data flow

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

@@ -241,7 +241,7 @@ final class RecordExprCfgNode extends Nodes::RecordExprCfgNode {
     exists(RecordExprField ref |
       ref = node.getRecordExprFieldList().getAField() and
       any(ChildMapping mapping).hasCfgChild(node, ref.getExpr(), this, result) and
-      field = ref.getNameRef().getText()
+      field = ref.getFieldName()
     )
   }
 }

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

@@ -34,4 +34,24 @@ module Impl {
     pragma[nomagic]
     string getText() { result = this.getPart().getNameRef().getText() }
   }
+
+  /** A simple identifier path. */
+  class IdentPath extends Path {
+    private string name;
+
+    IdentPath() {
+      not this.hasQualifier() and
+      exists(PathSegment ps |
+        ps = this.getPart() and
+        not ps.hasGenericArgList() and
+        not ps.hasParenthesizedArgList() and
+        not ps.hasPathType() and
+        not ps.hasReturnTypeSyntax() and
+        name = ps.getNameRef().getText()
+      )
+    }
+
+    /** Gets the identifier name. */
+    string getName() { result = name }
+  }
 }

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

@@ -11,6 +11,9 @@ private import codeql.rust.elements.internal.generated.RecordExprField
  * be referenced directly.
  */
 module Impl {
+  private import rust
+  private import codeql.rust.elements.internal.PathImpl::Impl as PathImpl
+
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A field in a record expression. For example `a: 1` in:
@@ -24,7 +27,27 @@ module Impl {
     private string toStringPart(int index) {
       index = 0 and result = this.getNameRef().getText()
       or
-      index = 1 and result = ": " + this.getExpr().toAbbreviatedString()
+      index = 1 and this.hasNameRef() and result = ": "
+      or
+      index = 2 and
+      result = this.getExpr().toAbbreviatedString()
+    }
+
+    /**
+     * Gets the name of the field. This includes the case when shorthand syntax is used:
+     *
+     * ```rust
+     * Foo {
+     *   a: 1, // field name is `a`
+     *   b     // field name is `b`
+     * }
+     * ```
+     */
+    string getFieldName() {
+      result = this.getNameRef().getText()
+      or
+      not this.hasNameRef() and
+      result = this.getExpr().(PathExpr).getPath().(PathImpl::IdentPath).getName()
     }
   }
 }

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

@@ -32,7 +32,7 @@ module Impl {
     RecordField getRecordField(string name) {
       exists(PathResolution::ItemNode i |
         i = PathResolution::resolvePath(this.getPath()) and
-        name = this.getRecordExprFieldList().getAField().getNameRef().getText()
+        name = this.getRecordExprFieldList().getAField().getFieldName()
       |
         result.isStructField(i, name) or
         result.isVariantField(i, name)

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

@@ -21,6 +21,17 @@ module Impl {
    * ```
    */
   class RecordPatField extends Generated::RecordPatField {
+    override string toString() { result = concat(int i | | this.toStringPart(i) order by i) }
+
+    private string toStringPart(int index) {
+      index = 0 and result = this.getNameRef().getText()
+      or
+      index = 1 and this.hasNameRef() and result = ": "
+      or
+      index = 2 and
+      result = this.getPat().toAbbreviatedString()
+    }
+
     /**
      * Gets the name of the field. This includes the case when shorthand syntax is used:
      *

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

@@ -1,6 +1,7 @@
 private import rust
 private import codeql.rust.controlflow.ControlFlowGraph
 private import codeql.rust.elements.internal.generated.ParentChild
+private import codeql.rust.elements.internal.PathImpl::Impl as PathImpl
 private import codeql.rust.elements.internal.PathExprBaseImpl::Impl as PathExprBaseImpl
 private import codeql.rust.elements.internal.FormatTemplateVariableAccessImpl::Impl as FormatTemplateVariableAccessImpl
 private import codeql.util.DenseRank
@@ -172,16 +173,7 @@ module Impl {
     string name_;
 
     VariableAccessCand() {
-      exists(Path p, PathSegment ps |
-        p = this.(PathExpr).getPath() and
-        not p.hasQualifier() and
-        ps = p.getPart() and
-        not ps.hasGenericArgList() and
-        not ps.hasParenthesizedArgList() and
-        not ps.hasPathType() and
-        not ps.hasReturnTypeSyntax() and
-        name_ = ps.getNameRef().getText()
-      )
+      name_ = this.(PathExpr).getPath().(PathImpl::IdentPath).getName()
       or
       this.(FormatTemplateVariableAccess).getName() = name_
     }

rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField.expected

@@ -1,2 +1,2 @@
-| gen_record_pat_field.rs:5:15:5:18 | RecordPatField | getNumberOfAttrs: | 0 | hasNameRef: | yes | hasPat: | yes |
-| gen_record_pat_field.rs:5:21:5:24 | RecordPatField | getNumberOfAttrs: | 0 | hasNameRef: | yes | hasPat: | yes |
+| gen_record_pat_field.rs:5:15:5:18 | a: 1 | getNumberOfAttrs: | 0 | hasNameRef: | yes | hasPat: | yes |
+| gen_record_pat_field.rs:5:21:5:24 | b: 2 | getNumberOfAttrs: | 0 | hasNameRef: | yes | hasPat: | yes |

rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getNameRef.expected

@@ -1,2 +1,2 @@
-| gen_record_pat_field.rs:5:15:5:18 | RecordPatField | gen_record_pat_field.rs:5:15:5:15 | a |
-| gen_record_pat_field.rs:5:21:5:24 | RecordPatField | gen_record_pat_field.rs:5:21:5:21 | b |
+| gen_record_pat_field.rs:5:15:5:18 | a: 1 | gen_record_pat_field.rs:5:15:5:15 | a |
+| gen_record_pat_field.rs:5:21:5:24 | b: 2 | gen_record_pat_field.rs:5:21:5:21 | b |

rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.expected

@@ -1,2 +1,2 @@
-| gen_record_pat_field.rs:5:15:5:18 | RecordPatField | gen_record_pat_field.rs:5:18:5:18 | 1 |
-| gen_record_pat_field.rs:5:21:5:24 | RecordPatField | gen_record_pat_field.rs:5:24:5:24 | 2 |
+| gen_record_pat_field.rs:5:15:5:18 | a: 1 | gen_record_pat_field.rs:5:18:5:18 | 1 |
+| gen_record_pat_field.rs:5:21:5:24 | b: 2 | gen_record_pat_field.rs:5:24:5:24 | 2 |

rust/ql/test/library-tests/dataflow/local/CONSISTENCY/DataFlowConsistency.expected

@@ -1,2 +1,2 @@
 identityLocalStep
-| main.rs:427:9:427:20 | phi(default_name) | Node steps to itself |
+| main.rs:425:9:425:20 | phi(default_name) | Node steps to itself |