From a35017dc7c9a53c40a1ee4bf1db269228e0faebf Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Mon, 8 Jul 2013 09:48:51 +0200 Subject: [PATCH] [multiple changes] 2013-07-08 Hristian Kirtchev * exp_ch3.adb (Freeze_Type): Generate a subpools-related accessibility check only on profiles that include the corresponding library unit. 2013-07-08 Gary Dismukes * sem_ch8.adb: Minor typo fixes. From-SVN: r200757 --- gcc/ada/ChangeLog | 10 ++++++++++ gcc/ada/exp_ch3.adb | 8 +++++++- gcc/ada/sem_ch8.adb | 4 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index c7f9f39a178..4924539ae03 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,13 @@ +2013-07-08 Hristian Kirtchev + + * exp_ch3.adb (Freeze_Type): Generate a + subpools-related accessibility check only on profiles that + include the corresponding library unit. + +2013-07-08 Gary Dismukes + + * sem_ch8.adb: Minor typo fixes. + 2013-07-08 Javier Miranda * sem_ch8.adb (Save_Scope_Stack): Adding documentation. diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index 160b92df40b..df1935cf54d 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -7284,11 +7284,17 @@ package body Exp_Ch3 is -- When compiling in Ada 2012 mode, ensure that the accessibility -- level of the subpool access type is not deeper than that of the -- pool_with_subpools. This check is not performed on .NET/JVM - -- since those targets do not support pools. + -- since these targets do not support pools. The check is omitted + -- on profiles that lack package System.Storage_Pools.Subpools. elsif Ada_Version >= Ada_2012 and then Present (Associated_Storage_Pool (Def_Id)) and then VM_Target = No_VM + + -- ??? Temporary workaround until restriction No_Storage_Pools + -- is implemented. + + and then RTE_Available (RE_Root_Storage_Pool_With_Subpools) then declare Loc : constant Source_Ptr := Sloc (Def_Id); diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb index c5d2e9925d2..3ceba7709f4 100644 --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -7707,10 +7707,10 @@ package body Sem_Ch8 is -- - Extra code was added to verify that all the elements of Elist1 -- are found in Elist2 - -- This test show that there may be more occurrences of this problem which + -- This test shows that there may be more occurrences of this problem which -- have not yet been detected. As a result, we replaced that approach by -- the current one in which Save_Scope_Stack returns the list of entities - -- whose visibility is changed, and that list is passed to Restore_Scope + -- whose visibility is changed, and that list is passed to Restore_Scope_ -- Stack to undo that change. This approach is simpler and safer, although -- it consumes more memory. -- 2.30.2