filterx/expr-compound: add support for inline allocation of pointers

Signed-off-by: Balazs Scheidler <[email protected]>

Author: bazsi

lib/filterx/expr-compound.c

@@ -35,9 +35,12 @@
 typedef struct _FilterXCompoundExpr
 {
   FilterXExpr super;
-  FilterXExprList exprs;
   /* whether this is a statement expression */
   gboolean return_value_of_last_expr;
+
+  /* needs to come last, as this may inline the list of expressions into an
+   * array piggybacked at the end of this struct */
+  FilterXExprList exprs;
 } FilterXCompoundExpr;
 
 static gboolean
@@ -180,7 +183,19 @@ _optimize(FilterXExpr *s)
   FilterXCompoundExpr *self = (FilterXCompoundExpr *) s;
 
   filterx_expr_list_foreach_ref(&self->exprs, _optimize_expr, NULL);
-  return NULL;
+
+  /* reallocate self so we can store the list of expressions inline */
+  gsize new_size = FILTERX_POINTER_LIST_ALLOC_SIZE(self, exprs);
+  FilterXCompoundExpr *optimized = (FilterXCompoundExpr *) g_malloc(new_size);
+
+  memcpy(optimized, self, sizeof(*self));
+  optimized->super.ref_cnt = 1;
+  optimized->super.lloc = NULL;
+  optimized->super.expr_text = NULL;
+  filterx_expr_set_location_with_text(&optimized->super, s->lloc, s->expr_text);
+
+  filterx_pointer_list_seal_inline(&optimized->exprs, &self->exprs);
+  return &optimized->super;
 }
 
 static gboolean

lib/filterx/expr-literal-container.c

@@ -34,7 +34,6 @@ struct FilterXLiteralElement_
 {
   FilterXExpr *key;
   FilterXExpr *value;
-  gboolean literal;
 };
 
 static gboolean
@@ -57,7 +56,6 @@ _literal_element_optimize(FilterXLiteralElement *self)
 {
   self->key = filterx_expr_optimize(self->key);
   self->value = filterx_expr_optimize(self->value);
-  self->literal = filterx_expr_is_literal(self->key) && filterx_expr_is_literal(self->value);
 }
 
 static void
@@ -178,7 +176,7 @@ _literal_container_optimize(FilterXExpr *s)
       FilterXLiteralElement *elem = (FilterXLiteralElement *) filterx_pointer_list_index(&self->elements, i);
 
       _literal_element_optimize(elem);
-      if (!elem->literal)
+      if (!filterx_expr_is_literal(elem->key) || !filterx_expr_is_literal(elem->value))
         literal = FALSE;
     }
   if (literal)