aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/gcc-interface
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@gcc.gnu.org>2020-05-12 22:34:50 +0200
committerEric Botcazou <ebotcazou@gcc.gnu.org>2020-05-12 22:35:55 +0200
commit27c3d986c4e704336c17155c558911beff1e1385 (patch)
treea379266065b29cc139d58be43dfaf7ab977e7c34 /gcc/ada/gcc-interface
parent90b160f8ec515f54ddc36519a6aaa60abdabdec1 (diff)
downloadgcc-27c3d986c4e704336c17155c558911beff1e1385.zip
gcc-27c3d986c4e704336c17155c558911beff1e1385.tar.gz
gcc-27c3d986c4e704336c17155c558911beff1e1385.tar.bz2
Be prepared for more aggregates in gigi
This makes sure that gigi is prepared to handle more aggregates in the special memset code path. * sem_aggr.ads (Is_Single_Aggregate): New function. * sem_aggr.adb (Is_Others_Aggregate): Use local variable. (Is_Single_Aggregate): New function to recognize an aggregate with a single association containing a single choice. * fe.h (Is_Others_Aggregate): Delete. (Is_Single_Aggregate): New declaration. * gcc-interface/trans.c (gnat_to_gnu) <N_Assignment_Statement>: Call Is_Single_Aggregate instead of Is_Others_Aggregate.
Diffstat (limited to 'gcc/ada/gcc-interface')
-rw-r--r--gcc/ada/gcc-interface/trans.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index cddeae3..b7a4cad 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -7887,7 +7887,7 @@ gnat_to_gnu (Node_Id gnat_node)
const bool use_memset_p
= regular_array_type_p
&& Nkind (gnat_inner) == N_Aggregate
- && Is_Others_Aggregate (gnat_inner);
+ && Is_Single_Aggregate (gnat_inner);
/* If we use memset, we need to find the innermost expression. */
if (use_memset_p)
@@ -7897,7 +7897,7 @@ gnat_to_gnu (Node_Id gnat_node)
gnat_temp
= Expression (First (Component_Associations (gnat_temp)));
} while (Nkind (gnat_temp) == N_Aggregate
- && Is_Others_Aggregate (gnat_temp));
+ && Is_Single_Aggregate (gnat_temp));
gnu_rhs = gnat_to_gnu (gnat_temp);
}
else