3 files changed, 34 insertions, 36 deletions
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index 2158bb6..54496ea 100644
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -315,23 +315,17 @@ GNAT_ADA_OBJS =	\
  ada/cstand.o	\
  ada/debug.o	\
  ada/debug_a.o	\
- ada/diagnostics-brief_emitter.o      \
- ada/diagnostics-constructors.o      \
- ada/diagnostics-converter.o      \
- ada/diagnostics-json_utils.o      \
- ada/diagnostics-pretty_emitter.o      \
- ada/diagnostics-repository.o      \
- ada/diagnostics-sarif_emitter.o      \
- ada/diagnostics-switch_repository.o      \
- ada/diagnostics-utils.o      \
- ada/diagnostics.o      \
  ada/einfo-entities.o \
  ada/einfo-utils.o \
  ada/einfo.o	\
  ada/elists.o	\
  ada/err_vars.o	\
+ ada/errid.o \
  ada/errout.o	\
  ada/erroutc.o	\
+ ada/erroutc-pretty_emitter.o \
+ ada/erroutc-sarif_emitter.o \
+ ada/errsw.o \
  ada/eval_fat.o	\
  ada/exp_aggr.o	\
  ada/exp_spark.o	\
@@ -380,6 +374,7 @@ GNAT_ADA_OBJS =	\
  ada/impunit.o	\
  ada/inline.o	\
  ada/itypes.o	\
+ ada/json_utils.o \
  ada/krunch.o	\
  ada/layout.o	\
  ada/lib-load.o	\
@@ -562,8 +557,6 @@ GNAT_ADA_OBJS+= \
  ada/libgnat/s-secsta.o	\
  ada/libgnat/s-soflin.o	\
  ada/libgnat/s-soliin.o	\
- ada/libgnat/s-spark.o	\
- ada/libgnat/s-spcuop.o	\
  ada/libgnat/s-stache.o	\
  ada/libgnat/s-stalib.o	\
  ada/libgnat/s-stoele.o	\
@@ -575,11 +568,8 @@ GNAT_ADA_OBJS+= \
  ada/libgnat/s-trasym.o \
  ada/libgnat/s-unstyp.o	\
  ada/libgnat/s-valint.o	\
- ada/libgnat/s-valspe.o	\
  ada/libgnat/s-valuns.o	\
  ada/libgnat/s-valuti.o	\
- ada/libgnat/s-vs_int.o \
- ada/libgnat/s-vs_uns.o \
  ada/libgnat/s-wchcnv.o	\
  ada/libgnat/s-wchcon.o	\
  ada/libgnat/s-wchjis.o	\
@@ -615,23 +605,17 @@ GNATBIND_OBJS = \
  ada/casing.o     \
  ada/csets.o      \
  ada/debug.o      \
- ada/diagnostics-brief_emitter.o      \
- ada/diagnostics-constructors.o      \
- ada/diagnostics-converter.o      \
- ada/diagnostics-json_utils.o      \
- ada/diagnostics-pretty_emitter.o      \
- ada/diagnostics-repository.o      \
- ada/diagnostics-sarif_emitter.o      \
- ada/diagnostics-switch_repository.o      \
- ada/diagnostics-utils.o      \
- ada/diagnostics.o      \
  ada/einfo-entities.o \
  ada/einfo-utils.o \
  ada/einfo.o      \
  ada/elists.o     \
  ada/err_vars.o   \
+ ada/errid.o      \
  ada/errout.o     \
  ada/erroutc.o    \
+ ada/erroutc-sarif_emitter.o \
+ ada/erroutc-pretty_emitter.o \
+ ada/errsw.o      \
  ada/exit.o       \
  ada/final.o      \
  ada/fmap.o       \
@@ -639,6 +623,7 @@ GNATBIND_OBJS = \
  ada/gnatbind.o   \
  ada/gnatvsn.o    \
  ada/hostparm.o   \
+ ada/json_utils.o \
  ada/lib.o        \
  ada/link.o       \
  ada/namet.o      \
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 2c42cb1..a8777e1 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -328,16 +328,11 @@ GNATMAKE_OBJS = a-except.o ali.o ali-util.o aspects.o s-casuti.o alloc.o \
  switch.o switch-m.o table.o targparm.o tempdir.o types.o uintp.o \
  uname.o urealp.o usage.o widechar.o warnsw.o \
  seinfo.o einfo-entities.o einfo-utils.o sinfo-nodes.o sinfo-utils.o \
- diagnostics-brief_emitter.o  \
- diagnostics-constructors.o  \
- diagnostics-converter.o  \
- diagnostics-json_utils.o  \
- diagnostics-pretty_emitter.o  \
- diagnostics-repository.o  \
- diagnostics-sarif_emitter.o  \
- diagnostics-switch_repository.o  \
- diagnostics-utils.o  \
- diagnostics.o  \
+ errid.o \
+ errsw.o \
+ erroutc-pretty_emitter.o \
+ erroutc-sarif_emitter.o \
+ json_utils.o
  $(EXTRA_GNATMAKE_OBJS)
 
 # Make arch match the current multilib so that the RTS selection code
diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc
index 1694b4e..972607a 100644
--- a/gcc/ada/gcc-interface/decl.cc
+++ b/gcc/ada/gcc-interface/decl.cc
@@ -1228,6 +1228,24 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
 	    gnu_expr = gnat_build_constructor (gnu_type, v);
 	  }
 
+	/* If we are allocating the anonymous object of a small aggregate on
+	   the stack, zero-initialize it so that the entire object is assigned
+	   and the subsequent assignments need not preserve unknown bits, but
+	   do it only when optimization is enabled for the sake of consistency
+	   with the gimplifier which does the same for CONSTRUCTORs.  */
+	else if (definition
+		 && !imported_p
+		 && !static_flag
+		 && !gnu_expr
+		 && TREE_CODE (gnu_type) == RECORD_TYPE
+		 && TREE_CODE (gnu_object_size) == INTEGER_CST
+		 && compare_tree_int (gnu_object_size, MAX_FIXED_MODE_SIZE) <= 0
+		 && Present (Related_Expression (gnat_entity))
+		 && Nkind (Original_Node (Related_Expression (gnat_entity)))
+		    == N_Aggregate
+		 && optimize)
+	    gnu_expr = build_constructor (gnu_type, NULL);
+
 	/* Convert the expression to the type of the object if need be.  */
 	if (gnu_expr && initial_value_needs_conversion (gnu_type, gnu_expr))
 	  gnu_expr = convert (gnu_type, gnu_expr);
@@ -5251,7 +5269,7 @@ inline_status_for_subprog (Entity_Id subprog)
 	  && Is_Record_Type (Etype (First_Formal (subprog)))
 	  && (gnu_type = gnat_to_gnu_type (Etype (First_Formal (subprog))))
 	  && !TYPE_IS_BY_REFERENCE_P (gnu_type)
-	  && tree_fits_uhwi_p (TYPE_SIZE (gnu_type))
+	  && TREE_CODE (TYPE_SIZE (gnu_type)) == INTEGER_CST
 	  && compare_tree_int (TYPE_SIZE (gnu_type), MAX_FIXED_MODE_SIZE) <= 0)
 	return is_prescribed;