From 1bafcab05cbff1cc98e3ca867b4474401eec729b Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Wed, 29 Sep 2021 16:10:23 +0200 Subject: [PATCH] [Ada] Simplify initialization of concurrent components gcc/ada/ * exp_ch3.adb (Build_Init_Statements): Simplify detection of concurrent record types. --- gcc/ada/exp_ch3.adb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index 418306f30407..702c7da76e00 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -3206,9 +3206,7 @@ package body Exp_Ch3 is -- types moving any expanded code from the spec to the body of the -- init procedure. - if Is_Task_Record_Type (Rec_Type) - or else Is_Protected_Record_Type (Rec_Type) - then + if Is_Concurrent_Record_Type (Rec_Type) then declare Decl : constant Node_Id := Parent (Corresponding_Concurrent_Type (Rec_Type)); @@ -3589,12 +3587,11 @@ package body Exp_Ch3 is end loop; end if; end; - end if; -- For a protected type, add statements generated by -- Make_Initialize_Protection. - if Is_Protected_Record_Type (Rec_Type) then + elsif Is_Protected_Record_Type (Rec_Type) then Append_List_To (Stmts, Make_Initialize_Protection (Rec_Type)); end if; -- 2.47.2