[gcc r13-2927] ada: Fix checking of Refined_State with nested package renamings

Marc Poulhiès dkm@gcc.gnu.org
Thu Sep 29 09:09:20 GMT 2022


https://gcc.gnu.org/g:01ea0437ead0dda3acd51cfb80a01de5feb56929

commit r13-2927-g01ea0437ead0dda3acd51cfb80a01de5feb56929
Author: Piotr Trojanek <trojanek@adacore.com>
Date:   Fri Sep 23 19:06:54 2022 +0200

    ada: Fix checking of Refined_State with nested package renamings
    
    When collecting package state declared in package body, we should only
    recursively examine the visible part of nested packages while ignoring other
    entities related to packages (e.g. package bodies or package renamings).
    
    gcc/ada/
    
            * sem_util.adb (Collect_Visible_States): Ignore package renamings.

Diff:
---
 gcc/ada/sem_util.adb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 9ae082ca2e1..25e886e1ca1 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -6018,8 +6018,11 @@ package body Sem_Util is
                Append_New_Elmt (Item_Id, States);
 
             --  Recursively gather the visible states of a nested package
+            --  except for nested package renamings.
 
-            elsif Ekind (Item_Id) = E_Package then
+            elsif Ekind (Item_Id) = E_Package
+              and then No (Renamed_Entity (Item_Id))
+            then
                Collect_Visible_States (Item_Id, States);
             end if;


More information about the Gcc-cvs mailing list