From 50145b93899e4a184a20309942255b6e68f206b3 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Fri, 6 Jan 2017 12:19:47 +0100 Subject: [PATCH] [multiple changes] 2017-01-06 Yannick Moy * sem_attr.adb (Analyze_Attribute/Attribute_Loop_Entry): Analyze node in tree, which means not analyzing the previous prefix if the node has been rewritten into its prefix. 2017-01-06 Gary Dismukes * s-tpobop.adb: Minor reformatting. From-SVN: r244137 --- gcc/ada/ChangeLog | 10 ++++++++++ gcc/ada/s-tpobop.adb | 10 +++++----- gcc/ada/sem_attr.adb | 6 ++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index ce482e34e0e..e2fe43ef684 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,13 @@ +2017-01-06 Yannick Moy + + * sem_attr.adb (Analyze_Attribute/Attribute_Loop_Entry): Analyze node + in tree, which means not analyzing the previous prefix if the node has + been rewritten into its prefix. + +2017-01-06 Gary Dismukes + + * s-tpobop.adb: Minor reformatting. + 2017-01-06 Ed Schonberg * checks.adb (Ensure_Valid): Do not generate a validity check diff --git a/gcc/ada/s-tpobop.adb b/gcc/ada/s-tpobop.adb index a6f6c993d4e..3a884c5d894 100644 --- a/gcc/ada/s-tpobop.adb +++ b/gcc/ada/s-tpobop.adb @@ -348,17 +348,17 @@ package body System.Tasking.Protected_Objects.Operations is or else Object.Entry_Queue_Maxes /= null then -- Need to check the queue length. Computing the length is an - -- unusual case and is slow (need to walk the queue) + -- unusual case and is slow (need to walk the queue). Queue_Length := Queuing.Count_Waiting (Object.Entry_Queues (E)); if (Run_Time_Restrictions.Set (Max_Entry_Queue_Length) - and then Queue_Length >= + and then Queue_Length >= Run_Time_Restrictions.Value (Max_Entry_Queue_Length)) or else - (Object.Entry_Queue_Maxes /= null - and then Object.Entry_Queue_Maxes (Index) /= 0 - and then Queue_Length >= Object.Entry_Queue_Maxes (Index)) + (Object.Entry_Queue_Maxes /= null + and then Object.Entry_Queue_Maxes (Index) /= 0 + and then Queue_Length >= Object.Entry_Queue_Maxes (Index)) then -- This violates the Max_Entry_Queue_Length restriction or the -- Max_Queue_Length bound, raise Program_Error. diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index db2f23d18c4..188872e483f 100644 --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -4488,9 +4488,11 @@ package body Sem_Attr is if Is_Ignored (Enclosing_Pragma) then Rewrite (N, Relocate_Node (P)); - end if; + Preanalyze_And_Resolve (N); - Preanalyze_And_Resolve (P); + else + Preanalyze_And_Resolve (P); + end if; end Loop_Entry; ------------- -- 2.30.2