ada: Fix (again) incorrect handling of Aggregate aspect

Previous fix stopped the processing of the Aggregate aspect early,
skipping the call to Record_Rep_Item, making later call to
Resolve_Container_Aggregate fail.

Also, the previous fix would not handle correctly the case where the
type is private and the check for non-array type can only be done at the
freeze point with the full type.

Adapt the resolving of the aspect when the input is not correct and the
parameters can't be resolved.

gcc/ada/

	* sem_ch13.adb (Analyze_One_Aspect): Call Record_Rep_Item.
	(Check_Aspect_At_Freeze_Point): Check the aspect is specified on
	non-array type only...
	(Analyze_One_Aspect): ... instead of doing it too early here.
	* sem_aggr.adb (Resolve_Container_Aggregate): Do nothing in case
	the parameters failed to resolve.

diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 3ebb30d64ed032249071e7c1e303d7950c3b13c1..8d8a26329b5a33481a7e26b6fdd2416a6c0bfb34 100644 (file)
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -3157,6 +3157,7 @@ package body Sem_Aggr is
 
       if Present (Add_Unnamed_Subp)
         and then No (New_Indexed_Subp)
+        and then Etype (Add_Unnamed_Subp) /= Any_Type
       then
          declare
             Elmt_Type : constant Entity_Id :=
@@ -3200,7 +3201,9 @@ package body Sem_Aggr is
             end if;
          end;
 
-      elsif Present (Add_Named_Subp) then
+      elsif Present (Add_Named_Subp)
+        and then Etype (Add_Named_Subp) /= Any_Type
+      then
          declare
             --  Retrieves types of container, key, and element from the
             --  specified insertion procedure.
@@ -3242,7 +3245,9 @@ package body Sem_Aggr is
             end loop;
          end;
 
-      elsif Present (Assign_Indexed_Subp) then
+      elsif Present (Assign_Indexed_Subp)
+        and then Etype (Assign_Indexed_Subp) /= Any_Type
+      then
          --  Indexed Aggregate. Positional or indexed component
          --  can be present, but not both. Choices must be static
          --  values or ranges with static bounds.

diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 317c4841d87234c6c4264eb7f080e1f1fe6d093e..073e8f9b0d8a0c6f784764a75f14e3bbcdfa7999 100644 (file)
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -4211,11 +4211,8 @@ package body Sem_Ch13 is
                   Aitem := Empty;
 
                when Aspect_Aggregate =>
-                  if Is_Array_Type (E) then
-                     Error_Msg_N
-                       ("aspect% can only be applied to non-array type", Id);
-                     goto Continue;
-                  end if;
+                  --  We will be checking that the aspect is not specified on a
+                  --  non-array type in Check_Aspect_At_Freeze_Point
 
                   Validate_Aspect_Aggregate (Expr);
                   Record_Rep_Item (E, Aspect);
@@ -11148,6 +11145,11 @@ package body Sem_Ch13 is
             return;
 
          when Aspect_Aggregate =>
+            if Is_Array_Type (Entity (ASN)) then
+               Error_Msg_N
+                 ("aspect% can only be applied to non-array type",
+                  Identifier (ASN));
+            end if;
             Resolve_Aspect_Aggregate (Entity (ASN), Expression (ASN));
             return;