From 7a1d54fa61881f6454f3e3282cf5cf692e140f93 Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Tue, 24 Mar 2020 10:27:10 +0100 Subject: [PATCH] [Ada] Remove excessive parens 2020-06-15 Piotr Trojanek gcc/ada/ * exp_ch6.adb, sem_util.adb: Remove excessive parents, especially since they don't make the code any easier to read. --- gcc/ada/exp_ch6.adb | 4 ++-- gcc/ada/sem_util.adb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index f436933..521289a 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -4525,7 +4525,7 @@ package body Exp_Ch6 is -- visible a private entity in the body of the main unit, -- that gigi will see before its sees its proper definition. - elsif not (In_Extended_Main_Code_Unit (Call_Node)) + elsif not In_Extended_Main_Code_Unit (Call_Node) and then In_Package_Body then Must_Inline := not In_Extended_Main_Source_Unit (Subp); @@ -4550,7 +4550,7 @@ package body Exp_Ch6 is if Front_End_Inlining and then Nkind (Spec) = N_Subprogram_Declaration - and then (In_Extended_Main_Code_Unit (Call_Node)) + and then In_Extended_Main_Code_Unit (Call_Node) and then No (Body_To_Inline (Spec)) and then not Has_Completion (Subp) and then In_Same_Extended_Unit (Sloc (Spec), Loc) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 9f97f7d..fc1d902 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -16150,7 +16150,7 @@ package body Sem_Util is and then not Is_Dispatching_Operation (Subp) and then Needs_Finalization (Etype (Subp)) and then not Is_Class_Wide_Type (Etype (Subp)) - and then not (Has_Invariants (Etype (Subp))) + and then not Has_Invariants (Etype (Subp)) and then Present (Subprogram_Body (Subp)) and then Was_Expression_Function (Subprogram_Body (Subp)) then -- 2.7.4