aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2021-12-13 20:25:15 +0100
committerPierre-Marie de Rodat <derodat@adacore.com>2022-01-07 16:24:07 +0000
commite8a52167ea10797308ecc0497127ba0ce44b707b (patch)
treed6c64d26fc69e47ffdf0dbe38b15a88002dc08a5 /gcc/ada
parent3174b67eefb20421d43a6c96473fe41ee4cd1bf9 (diff)
downloadgcc-e8a52167ea10797308ecc0497127ba0ce44b707b.zip
gcc-e8a52167ea10797308ecc0497127ba0ce44b707b.tar.gz
gcc-e8a52167ea10797308ecc0497127ba0ce44b707b.tar.bz2
[Ada] Remove unnecessary guard for inserting non-empty list
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.
Diffstat (limited to 'gcc/ada')
-rw-r--r--gcc/ada/exp_ch3.adb4
-rw-r--r--gcc/ada/exp_ch4.adb14
-rw-r--r--gcc/ada/exp_ch5.adb8
-rw-r--r--gcc/ada/exp_ch9.adb8
-rw-r--r--gcc/ada/freeze.adb2
5 files changed, 8 insertions, 28 deletions
diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index e3f5d48..1e9373a 100644
--- 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
index 21fa515..bf96e64 100644
--- 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
index b73a966..f9a9e7e 100644
--- 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
index b0f8148..82f61b3 100644
--- 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
index 32a82fb..2b89108 100644
--- 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);