aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2023-03-03 17:27:40 +0100
committerMarc Poulhiès <poulhies@adacore.com>2023-05-25 09:44:16 +0200
commitd1e196d39e592d053d2528b11874a6c228932431 (patch)
tree75137d3207c8cc5212bc5c67faa24d8e61d3a61e /gcc/ada
parentc7b84ce699965738b0f2f2d15039c716255f7588 (diff)
downloadgcc-d1e196d39e592d053d2528b11874a6c228932431.zip
gcc-d1e196d39e592d053d2528b11874a6c228932431.tar.gz
gcc-d1e196d39e592d053d2528b11874a6c228932431.tar.bz2
ada: Remove redundant guards from calls to Move_Aspects
Routine Move_Aspects does nothing if its From parameter has no aspects. There is no need to check this at the call sites. Code cleanup related to changes in handling of expressions functions in GNATprove; semantics is unaffected. gcc/ada/ * par-ch7.adb (P_Package): Remove redundant guard from call to Move_Aspects. * par-ch9.adb (P_Task): Likewise. * sem_ch6.adb (Analyze_Expression_Function, Is_Inline_Pragma): Likewise.
Diffstat (limited to 'gcc/ada')
-rw-r--r--gcc/ada/par-ch7.adb4
-rw-r--r--gcc/ada/par-ch9.adb4
-rw-r--r--gcc/ada/sem_ch6.adb8
3 files changed, 4 insertions, 12 deletions
diff --git a/gcc/ada/par-ch7.adb b/gcc/ada/par-ch7.adb
index e8a765b..fc96ce8 100644
--- a/gcc/ada/par-ch7.adb
+++ b/gcc/ada/par-ch7.adb
@@ -162,9 +162,7 @@ package body Ch7 is
-- Move the aspect specifications to the body node
- if Has_Aspects (Dummy_Node) then
- Move_Aspects (From => Dummy_Node, To => Package_Node);
- end if;
+ Move_Aspects (From => Dummy_Node, To => Package_Node);
Parse_Decls_Begin_End (Package_Node);
end if;
diff --git a/gcc/ada/par-ch9.adb b/gcc/ada/par-ch9.adb
index 752b28b..d6526de 100644
--- a/gcc/ada/par-ch9.adb
+++ b/gcc/ada/par-ch9.adb
@@ -140,9 +140,7 @@ package body Ch9 is
-- Move the aspect specifications to the body node
- if Has_Aspects (Dummy_Node) then
- Move_Aspects (From => Dummy_Node, To => Task_Node);
- end if;
+ Move_Aspects (From => Dummy_Node, To => Task_Node);
Parse_Decls_Begin_End (Task_Node);
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 48b363e..135d8ab 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -390,9 +390,7 @@ package body Sem_Ch6 is
-- function to the proper body when the expression function acts
-- as a completion.
- if Has_Aspects (N) then
- Move_Aspects (N, To => New_Body);
- end if;
+ Move_Aspects (N, To => New_Body);
Relocate_Pragmas_To_Body (New_Body);
@@ -2875,9 +2873,7 @@ package body Sem_Ch6 is
-- Move aspects to the new spec
- if Has_Aspects (N) then
- Move_Aspects (N, To => Decl);
- end if;
+ Move_Aspects (N, To => Decl);
Insert_Before (N, Decl);
Analyze (Decl);