Accept qualified aggregates in memset path

Aggregates can be surrounded by a qualified expression and this
prepares the support code in gigi for accepting them.

	* gcc-interface/trans.c (gnat_to_gnu) <N_Assignment_Statement>: Deal
	with qualified "others" aggregates in the memset case.

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 20662be25c746ed93424119fc960732b1d394eb5..6aec0eeede1206eced2f7e1e6b5e99ab20f96377 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/trans.c (gnat_to_gnu) <N_Assignment_Statement>: Deal
+       with qualified "others" aggregates in the memset case.
+
 2020-05-09  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/decl.c (gnat_to_gnu_param): Also back-annotate the

diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 20529e157e0571aeab6396eaa06701713f41d9a4..5de04abb97fab5fb6a598ce78222781ea1a9e597 100644 (file)
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -7813,25 +7813,29 @@ gnat_to_gnu (Node_Id gnat_node)
       else
        {
          const Node_Id gnat_expr = Expression (gnat_node);
+         const Node_Id gnat_inner
+           = Nkind (gnat_expr) == N_Qualified_Expression
+             ? Expression (gnat_expr)
+             : gnat_expr;
          const Entity_Id gnat_type
            = Underlying_Type (Etype (Name (gnat_node)));
          const bool regular_array_type_p
-           = (Is_Array_Type (gnat_type) && !Is_Bit_Packed_Array (gnat_type));
+           = Is_Array_Type (gnat_type) && !Is_Bit_Packed_Array (gnat_type);
          const bool use_memset_p
-           = (regular_array_type_p
-              && Nkind (gnat_expr) == N_Aggregate
-              && Is_Others_Aggregate (gnat_expr));
+           = regular_array_type_p
+             && Nkind (gnat_inner) == N_Aggregate
+             && Is_Others_Aggregate (gnat_inner);
 
-         /* If we'll use memset, we need to find the inner expression.  */
+         /* If we use memset, we need to find the innermost expression.  */
          if (use_memset_p)
            {
-             Node_Id gnat_inner
-               = Expression (First (Component_Associations (gnat_expr)));
-             while (Nkind (gnat_inner) == N_Aggregate
-                    && Is_Others_Aggregate (gnat_inner))
-               gnat_inner
-                 = Expression (First (Component_Associations (gnat_inner)));
-             gnu_rhs = gnat_to_gnu (gnat_inner);
+             gnat_temp = gnat_inner;
+             do {
+               gnat_temp
+                 = Expression (First (Component_Associations (gnat_temp)));
+             } while (Nkind (gnat_temp) == N_Aggregate
+                      && Is_Others_Aggregate (gnat_temp));
+             gnu_rhs = gnat_to_gnu (gnat_temp);
            }
          else
            gnu_rhs = maybe_unconstrained_array (gnat_to_gnu (gnat_expr));