From: Piotr Trojanek <troja...@adacore.com>
When killing known values of assignable entities we iterated from
First_Entity and then again from First_Private_Entity. This second
iteration was unnecessary, because the entity chain that starts with
First_Entity contains all entities, including the private ones.
This is just a performance improvement; the behavior is unchanged.
gcc/ada/
* sem_util.adb (Kill_Current_Values): Only iterate from
First_Entity through Next_Entity.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/sem_util.adb | 38 +++++++++-----------------------------
1 file changed, 9 insertions(+), 29 deletions(-)
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 9eeaf7cc05b..28396a4c34b 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -22287,25 +22287,6 @@ package body Sem_Util is
procedure Kill_Current_Values (Last_Assignment_Only : Boolean := False) is
S : Entity_Id;
- procedure Kill_Current_Values_For_Entity_Chain (E : Entity_Id);
- -- Clear current value for entity E and all entities chained to E
-
- ------------------------------------------
- -- Kill_Current_Values_For_Entity_Chain --
- ------------------------------------------
-
- procedure Kill_Current_Values_For_Entity_Chain (E : Entity_Id) is
- Ent : Entity_Id;
- begin
- Ent := E;
- while Present (Ent) loop
- Kill_Current_Values (Ent, Last_Assignment_Only);
- Next_Entity (Ent);
- end loop;
- end Kill_Current_Values_For_Entity_Chain;
-
- -- Start of processing for Kill_Current_Values
-
begin
-- Kill all saved checks, a special case of killing saved values
@@ -22321,16 +22302,15 @@ package body Sem_Util is
-- Clear current values of all entities in current scope
- Kill_Current_Values_For_Entity_Chain (First_Entity (S));
-
- -- If scope is a package, also clear current values of all private
- -- entities in the scope.
-
- if Is_Package_Or_Generic_Package (S)
- or else Is_Concurrent_Type (S)
- then
- Kill_Current_Values_For_Entity_Chain (First_Private_Entity (S));
- end if;
+ declare
+ Ent : Entity_Id;
+ begin
+ Ent := First_Entity (S);
+ while Present (Ent) loop
+ Kill_Current_Values (Ent, Last_Assignment_Only);
+ Next_Entity (Ent);
+ end loop;
+ end;
-- If this is a not a subprogram, deal with parents
--
2.34.1
