[COMMITED] ada: Fix checking of Refined_State with nested package renamings

Message ID 20220929091021.359477-1-poulhies@adacore.com
State New, archived
Headers
Series [COMMITED] ada: Fix checking of Refined_State with nested package renamings |

Commit Message

Marc Poulhiès Sept. 29, 2022, 9:10 a.m. UTC
  From: Piotr Trojanek <trojanek@adacore.com>

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.

Tested on x86_64-pc-linux-gnu, committed on master.

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

Patch

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;