From bdeeeaf71f1f4a9911d85c5aa5ad0500086201dc Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Wed, 3 Jun 2020 00:08:17 +0200 Subject: [PATCH] [Ada] Fix oversight in Delayed_Aspect_Present predicate gcc/ada/ * sem_ch3.adb (Delayed_Aspect_Present): Fix oversight in loop. * freeze.adb (Freeze_Object_Declaration): Use Declaration_Node instead of Parent for the sake of consistency. --- gcc/ada/freeze.adb | 4 ++-- gcc/ada/sem_ch3.adb | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index b24e9172260..74d15b57e8b 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -3439,11 +3439,11 @@ package body Freeze is if Has_Delayed_Aspects (E) and then Expander_Active and then Is_Array_Type (Typ) - and then Present (Expression (Parent (E))) + and then Present (Expression (Declaration_Node (E))) and then No (Linker_Section_Pragma (E)) then declare - Decl : constant Node_Id := Parent (E); + Decl : constant Node_Id := Declaration_Node (E); Lhs : constant Node_Id := New_Occurrence_Of (E, Loc); begin diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index a184a872834..435c69f7b3d 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -3891,9 +3891,11 @@ package body Sem_Ch3 is begin if Present (Aspect_Specifications (N)) then - A := First (Aspect_Specifications (N)); - A_Id := Get_Aspect_Id (Chars (Identifier (A))); + A := First (Aspect_Specifications (N)); + while Present (A) loop + A_Id := Get_Aspect_Id (Chars (Identifier (A))); + if A_Id = Aspect_Alignment or else A_Id = Aspect_Address then -- Set flag on object entity, for later processing at -- 2.30.2