[Ada] Fix handling of scopes for subprogram calls in unnesting
authorArnaud Charlet <charlet@adacore.com>
Thu, 11 Feb 2021 13:08:35 +0000 (14:08 +0100)
committerPierre-Marie de Rodat <derodat@adacore.com>
Tue, 15 Jun 2021 10:19:34 +0000 (06:19 -0400)
gcc/ada/

* exp_unst.adb (Unnest_Subprogram.Build_Table.Visit_Node): Fix
handling of scopes for subprogram calls.

gcc/ada/exp_unst.adb

index 6fd7a0e..52d6142 100644 (file)
@@ -883,7 +883,7 @@ package body Exp_Unst is
                      --  within Subp. Calls to Subp itself or to subprograms
                      --  outside the nested structure do not affect us.
 
-                     if Scope_Within (Ent, Subp)
+                     if Scope_Within (Ultimate_Alias (Ent), Subp)
                        and then Is_Subprogram (Ent)
                        and then not Is_Imported (Ent)
                      then