[Ada] Fix incorrect computation of Component_Size in ASIS mode

2018-10-09  Eric Botcazou  <ebotcazou@adacore.com>

gcc/ada/

	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Constant>: If
	this is not a definition, retrieve the expression in all cases
	even if we are just annotating types.
	* gcc-interface/trans.c (gnat_to_gnu): Also translate Size
	attribute for constrained types in this mode.

From-SVN: r264983

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d393c453eefddb41022fb464aa3730489947c392..924e8d62069d48e0f47d6a8dd440e72a2c27a7d3 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2018-10-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/decl.c (gnat_to_gnu_entity) <E_Constant>: If
+       this is not a definition, retrieve the expression in all cases
+       even if we are just annotating types.
+       * gcc-interface/trans.c (gnat_to_gnu): Also translate Size
+       attribute for constrained types in this mode.
+
 2018-10-09  Eric Botcazou  <ebotcazou@adacore.com>
 
        * adaint.c (__gnat_get_executable_suffix_ptr): Add new line.

diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index ff87529790a060246636b125cdf6699088403f90..a0d2cbeb159ee1003e0722228eecedad7ed46b85 100644 (file)
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -612,8 +612,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
          && !No_Initialization (gnat_decl)
          && !Is_Dispatch_Table_Entity (gnat_entity)
          && Present (gnat_temp = Expression (gnat_decl))
-         && Nkind (gnat_temp) != N_Allocator
-         && (!type_annotate_only || Compile_Time_Known_Value (gnat_temp)))
+         && Nkind (gnat_temp) != N_Allocator)
        gnu_expr = gnat_to_gnu_external (gnat_temp);
 
       /* ... fall through ... */

diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 53513e538f14b2498bd96fb17916a797381d075d..6757c2fedc0b5d1e3ebb8537bbd59b645dbb2a44 100644 (file)
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -5930,8 +5930,9 @@ gnat_to_gnu (Node_Id gnat_node)
            || kind == N_Type_Conversion)
           && Is_Integer_Type (Etype (gnat_node)))
       && !(kind == N_Attribute_Reference
-          && Get_Attribute_Id (Attribute_Name (gnat_node)) == Attr_Length
-          && Ekind (Etype (Prefix (gnat_node))) == E_Array_Subtype
+          && (Get_Attribute_Id (Attribute_Name (gnat_node)) == Attr_Length
+              || Get_Attribute_Id (Attribute_Name (gnat_node)) == Attr_Size)
+          && Is_Constrained (Etype (Prefix (gnat_node)))
           && !Is_Constr_Subt_For_U_Nominal (Etype (Prefix (gnat_node))))
       && kind != N_Expanded_Name
       && kind != N_Identifier