https://gcc.gnu.org/g:bc97504e021fd8719fa6d9e31c311b38e87a3900
commit r13-8434-gbc97504e021fd8719fa6d9e31c311b38e87a3900
Author: Marc Poulhiès <poulh...@adacore.com>
Date: Tue Feb 28 17:10:29 2023 +0100
ada: Fix incorrect handling of Aggregate aspect
This change fixes 2 incorrect handlings of the aspect.
The arguments are now correctly resolved and the aspect is rejected on
non array types.
gcc/ada/
* sem_ch13.adb (Analyze_One_Aspect): Mark Aggregate aspect as
needing delayed resolution and reject the aspect on non-array
type.
Diff:
---
gcc/ada/sem_ch13.adb | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index b81b6b02e1d..317c4841d87 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -2921,10 +2921,10 @@ package body Sem_Ch13 is
end case;
if Delay_Required
-
and then (A_Id = Aspect_Stable_Properties
or else A_Id = Aspect_Designated_Storage_Model
- or else A_Id = Aspect_Storage_Model_Type)
+ or else A_Id = Aspect_Storage_Model_Type
+ or else A_Id = Aspect_Aggregate)
-- ??? It seems like we should do this for all aspects, not
-- just these, but that causes as-yet-undiagnosed regressions.
@@ -4211,6 +4211,12 @@ 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;
+
Validate_Aspect_Aggregate (Expr);
Record_Rep_Item (E, Aspect);
goto Continue;
