Merge pull request #12712 from github/sashabu/repeated-initializers

C++: Support repeated initializers in dbscheme.

cpp/ql/lib/semmle/code/cpp/exprs/Literal.qll

@@ -192,7 +192,8 @@ class ClassAggregateLiteral extends AggregateLiteral {
    */
   Expr getFieldExpr(Field field) {
     field = classType.getAField() and
-    aggregate_field_init(underlyingElement(this), unresolveElement(result), unresolveElement(field))
+    aggregate_field_init(underlyingElement(this), unresolveElement(result), unresolveElement(field),
+      _)
   }
 
   /**
@@ -264,7 +265,7 @@ class ArrayOrVectorAggregateLiteral extends AggregateLiteral {
    * element `elementIndex`, if present.
    */
   Expr getElementExpr(int elementIndex) {
-    aggregate_array_init(underlyingElement(this), unresolveElement(result), elementIndex)
+    aggregate_array_init(underlyingElement(this), unresolveElement(result), elementIndex, _)
   }
 
   /**

cpp/ql/lib/semmlecode.cpp.dbscheme

@@ -1820,24 +1820,26 @@ new_array_allocated_type(
 
 /**
  * The field being initialized by an initializer expression within an aggregate
- * initializer for a class/struct/union.
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
  */
-#keyset[aggregate, field]
+#keyset[aggregate, position]
 aggregate_field_init(
     int aggregate: @aggregateliteral ref,
     int initializer: @expr ref,
-    int field: @membervariable ref
+    int field: @membervariable ref,
+    int position: int ref
 );
 
 /**
  * The index of the element being initialized by an initializer expression
- * within an aggregate initializer for an array.
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
  */
-#keyset[aggregate, element_index]
+#keyset[aggregate, position]
 aggregate_array_init(
     int aggregate: @aggregateliteral ref,
     int initializer: @expr ref,
-    int element_index: int ref
+    int element_index: int ref,
+    int position: int ref
 );
 
 @ctorinit = @ctordirectinit

cpp/ql/lib/upgrades/a5bb28ed29f73855d64cc5f939cef977fa8fd19a/aggregate_array_init.ql

@@ -0,0 +1,11 @@
+class AggregateLiteral extends @aggregateliteral {
+  string toString() { none() }
+}
+
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+from AggregateLiteral al, Expr init, int index, int position
+where exprparents(init, position, al) and aggregate_array_init(al, init, index)
+select al, init, index, position

cpp/ql/lib/upgrades/a5bb28ed29f73855d64cc5f939cef977fa8fd19a/aggregate_field_init.ql

@@ -0,0 +1,15 @@
+class AggregateLiteral extends @aggregateliteral {
+  string toString() { none() }
+}
+
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Field extends @membervariable {
+  string toString() { none() }
+}
+
+from AggregateLiteral al, Expr init, Field field, int position
+where exprparents(init, position, al) and aggregate_field_init(al, init, field)
+select al, init, field, position

cpp/ql/lib/upgrades/a5bb28ed29f73855d64cc5f939cef977fa8fd19a/upgrade.properties

@@ -0,0 +1,4 @@
+description: Support repeated initializers, which are allowed in C with designated initializers.
+compatibility: full
+aggregate_field_init.rel: run aggregate_field_init.qlo
+aggregate_array_init.rel: run aggregate_array_init.qlo