* [Ada] Remove unnecessary guard for inserting non-empty list
@ 2022-01-07 16:27 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2022-01-07 16:27 UTC (permalink / raw)
To: gcc-patches; +Cc: Piotr Trojanek
[-- Attachment #1: Type: text/plain, Size: 616 bytes --]
Calls to Insert_List_After and Insert_List_Before applied to empty lists
do nothing, so there is no need to explicitly guard against such calls.
Code cleanup; semantics is unaffected.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* exp_ch3.adb (Expand_N_Object_Declaration): Remove unnecessary
guards.
* exp_ch4.adb (Expand_N_If_Expression): Likewise; clarify comment.
* exp_ch5.adb (Expand_N_If_Statement,
Expand_Iterator_Loop_Over_Container): Likewise.
* exp_ch9.adb (Expand_N_Task_Type_Declaration): Remove redundant
guard.
* freeze.adb (Freeze_All_Ent): Reduce scope of a local variable.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 3578 bytes --]
diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
--- a/gcc/ada/exp_ch3.adb
+++ b/gcc/ada/exp_ch3.adb
@@ -6908,9 +6908,7 @@ package body Exp_Ch3 is
New_Nodes := Make_DT (Base_Typ, N);
end if;
- if not Is_Empty_List (New_Nodes) then
- Insert_List_Before (N, New_Nodes);
- end if;
+ Insert_List_Before (N, New_Nodes);
end;
end if;
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -6198,18 +6198,10 @@ package body Exp_Ch4 is
Set_Sloc (Parent (N), Loc);
end if;
- -- Make sure Then_Actions and Else_Actions are appropriately moved
- -- to the new if statement.
+ -- Move Then_Actions and Else_Actions, if any, to the new if statement
- if Present (Then_Actions (N)) then
- Insert_List_Before
- (First (Then_Statements (New_If)), Then_Actions (N));
- end if;
-
- if Present (Else_Actions (N)) then
- Insert_List_Before
- (First (Else_Statements (New_If)), Else_Actions (N));
- end if;
+ Insert_List_Before (First (Then_Statements (New_If)), Then_Actions (N));
+ Insert_List_Before (First (Else_Statements (New_If)), Else_Actions (N));
Insert_Action (N, Decl);
Insert_Action (N, New_If);
diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb
--- a/gcc/ada/exp_ch5.adb
+++ b/gcc/ada/exp_ch5.adb
@@ -4559,9 +4559,7 @@ package body Exp_Ch5 is
Set_Else_Statements (N, New_List (New_If));
- if Present (Condition_Actions (E)) then
- Insert_List_Before (New_If, Condition_Actions (E));
- end if;
+ Insert_List_Before (New_If, Condition_Actions (E));
Remove (E);
@@ -5455,9 +5453,7 @@ package body Exp_Ch5 is
-- Condition_Actions of the iterator. Insert them now at the head of
-- the loop.
- if Present (Condition_Actions (Isc)) then
- Insert_List_Before (N, Condition_Actions (Isc));
- end if;
+ Insert_List_Before (N, Condition_Actions (Isc));
Rewrite (N, New_Loop);
Analyze (N);
diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb
--- a/gcc/ada/exp_ch9.adb
+++ b/gcc/ada/exp_ch9.adb
@@ -12516,13 +12516,7 @@ package body Exp_Ch9 is
-- procedure for this corresponding record type and we won't get it
-- in time if we don't freeze now.
- declare
- L : constant List_Id := Freeze_Entity (Rec_Ent, N);
- begin
- if Is_Non_Empty_List (L) then
- Insert_List_After (Body_Decl, L);
- end if;
- end;
+ Insert_List_After (Body_Decl, List => Freeze_Entity (Rec_Ent, N));
end if;
-- Complete the expansion of access types to the current task type, if
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -2354,7 +2354,6 @@ package body Freeze is
procedure Freeze_All_Ent (From : Entity_Id; After : in out Node_Id) is
E : Entity_Id;
Flist : List_Id;
- Lastn : Node_Id;
procedure Process_Flist;
-- If freeze nodes are present, insert and analyze, and reset cursor
@@ -2365,6 +2364,7 @@ package body Freeze is
-------------------
procedure Process_Flist is
+ Lastn : Node_Id;
begin
if Is_Non_Empty_List (Flist) then
Lastn := Next (After);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-01-07 16:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-07 16:27 [Ada] Remove unnecessary guard for inserting non-empty list Pierre-Marie de Rodat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).