When complaining about a compile-time constraint error within a default
initialization procedure we assumed that this procedure initializes a
record object. However, it can initialize an array object too.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* exp_util.adb (Inside_Init_Proc): Simplify.
* sem_aggr.adb (Resolve_Record_Aggregate): Fix style.
* sem_util.adb (Compile_Time_Constraint_Error): Guard against
calling Corresponding_Concurrent_Type with an array type entity.diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -7994,10 +7994,8 @@ package body Exp_Util is
----------------------
function Inside_Init_Proc return Boolean is
- Proc : constant Entity_Id := Enclosing_Init_Proc;
-
begin
- return Proc /= Empty;
+ return Present (Enclosing_Init_Proc);
end Inside_Init_Proc;
----------------------
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -5307,8 +5307,8 @@ package body Sem_Aggr is
Add_Association
(Component => Component,
- Expr => Empty,
- Assoc_List => New_Assoc_List,
+ Expr => Empty,
+ Assoc_List => New_Assoc_List,
Is_Box_Present => True);
elsif Present (Parent (Component))
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -6589,11 +6589,16 @@ package body Sem_Util is
if Inside_Init_Proc then
declare
+ Init_Proc_Type : constant Entity_Id :=
+ Entity (Parameter_Type (First
+ (Parameter_Specifications
+ (Parent (Current_Scope_No_Loops)))));
+
Conc_Typ : constant Entity_Id :=
- Corresponding_Concurrent_Type
- (Entity (Parameter_Type (First
- (Parameter_Specifications
- (Parent (Current_Scope))))));
+ (if Present (Init_Proc_Type)
+ and then Init_Proc_Type in E_Record_Type_Id
+ then Corresponding_Concurrent_Type (Init_Proc_Type)
+ else Empty);
begin
-- Don't complain if the corresponding concurrent type
