C++: dbscheme/library changes to support C99 designated initializers

nickrolfe · nickrolfe · commit d068d71ccbeb · 2018-08-30T22:42:30.000+01:00
diff --git a/cpp/ql/src/semmle/code/cpp/exprs/Literal.qll b/cpp/ql/src/semmle/code/cpp/exprs/Literal.qll
@@ -173,7 +173,7 @@ class ClassAggregateLiteral extends AggregateLiteral {
    */
   Expr getFieldExpr(Field field) {
     field = classType.getAField() and
-    result = getChild(field.getInitializationOrder())
+    aggregate_field_init(this, result, field)
   }
 
   /**
@@ -230,7 +230,7 @@ class ArrayAggregateLiteral extends AggregateLiteral {
    * element `elementIndex`, if present.
    */
   Expr getElementExpr(int elementIndex) {
-    result = getChild(elementIndex)
+    aggregate_array_init(this, result, elementIndex)
   }
 
   /**
diff --git a/cpp/ql/src/semmlecode.cpp.dbscheme b/cpp/ql/src/semmlecode.cpp.dbscheme
@@ -1400,6 +1400,18 @@ new_array_allocated_type(
     int type_id: @type ref
 );
 
+aggregate_field_init(
+    unique int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref
+);
+
+aggregate_array_init(
+    unique int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref
+);
+
 @ctorinit = @ctordirectinit
           | @ctorvirtualinit
           | @ctorfieldinit
