[COMMITTED] ada: Remove redundant guards from calls to Move_Aspects
Checks
Commit Message
From: Piotr Trojanek <trojanek@adacore.com>
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.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/par-ch7.adb | 4 +---
gcc/ada/par-ch9.adb | 4 +---
gcc/ada/sem_ch6.adb | 8 ++------
3 files changed, 4 insertions(+), 12 deletions(-)
@@ -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;
@@ -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);
@@ -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);