From: Piotr Trojanek <trojanek@adacore.com>
Date: Fri, 23 Sep 2022 17:06:54 +0000 (+0200)
Subject: ada: Fix checking of Refined_State with nested package renamings
X-Git-Tag: basepoints/gcc-14~4280
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01ea0437ead0dda3acd51cfb80a01de5feb56929;p=thirdparty%2Fgcc.git

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 --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 9ae082ca2e19..25e886e1ca14 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;