public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-2029] [Ada] Simplify and reuse Is_Concurrent_Interface Date: Mon, 5 Jul 2021 13:15:15 +0000 (GMT) [thread overview] Message-ID: <20210705131515.01B043857433@sourceware.org> (raw) https://gcc.gnu.org/g:6cf7cc8ccf3a7f34c1772f8da11a1c127fee3363 commit r12-2029-g6cf7cc8ccf3a7f34c1772f8da11a1c127fee3363 Author: Piotr Trojanek <trojanek@adacore.com> Date: Fri Apr 30 12:02:35 2021 +0200 [Ada] Simplify and reuse Is_Concurrent_Interface gcc/ada/ * exp_ch3.adb (Stream_Operation_OK): Reuse Is_Concurrent_Interface. * sem_ch3.adb (Analyze_Interface_Declaration, Build_Derived_Record_Type): Likewise. * sem_ch6.adb (Check_Limited_Return): Likewise. * sem_util.adb (Is_Concurrent_Interface): Don't call Is_Interface because each of the Is_Protected_Interface, Is_Synchronized_Interface and Is_Task_Interface calls it anyway. Diff: --- gcc/ada/exp_ch3.adb | 7 +------ gcc/ada/sem_ch3.adb | 8 ++------ gcc/ada/sem_ch6.adb | 5 +---- gcc/ada/sem_util.adb | 8 +++----- 4 files changed, 7 insertions(+), 21 deletions(-) diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index ce6d294e923..2f997a39fc8 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -11251,12 +11251,7 @@ package body Exp_Ch3 is or else not Is_Abstract_Type (Typ) or else not Is_Derived_Type (Typ)) and then not Has_Unknown_Discriminants (Typ) - and then not - (Is_Interface (Typ) - and then - (Is_Task_Interface (Typ) - or else Is_Protected_Interface (Typ) - or else Is_Synchronized_Interface (Typ))) + and then not Is_Concurrent_Interface (Typ) and then not Restriction_Active (No_Streams) and then not Restriction_Active (No_Dispatch) and then No (No_Tagged_Streams_Pragma (Typ)) diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index aa73f3a350b..95a27a28da6 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -3493,9 +3493,7 @@ package body Sem_Ch3 is -- Check runtime support for synchronized interfaces - if (Is_Task_Interface (T) - or else Is_Protected_Interface (T) - or else Is_Synchronized_Interface (T)) + if Is_Concurrent_Interface (T) and then not RTE_Available (RE_Select_Specific_Data) then Error_Msg_CRT ("synchronized interfaces", T); @@ -9270,9 +9268,7 @@ package body Sem_Ch3 is and then Is_Limited_Record (Full_View (Parent_Type))) then if not Is_Interface (Parent_Type) - or else Is_Synchronized_Interface (Parent_Type) - or else Is_Protected_Interface (Parent_Type) - or else Is_Task_Interface (Parent_Type) + or else Is_Concurrent_Interface (Parent_Type) then Set_Is_Limited_Record (Derived_Type); end if; diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index 3697abaa23b..4b58d593733 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -6999,10 +6999,7 @@ package body Sem_Ch6 is -- A limited interface that is not immutably limited is OK if Is_Limited_Interface (R_Type) - and then - not (Is_Task_Interface (R_Type) - or else Is_Protected_Interface (R_Type) - or else Is_Synchronized_Interface (R_Type)) + and then not Is_Concurrent_Interface (R_Type) then null; diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 25060cc9502..ef575d0e9f7 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -16209,11 +16209,9 @@ package body Sem_Util is function Is_Concurrent_Interface (T : Entity_Id) return Boolean is begin - return Is_Interface (T) - and then - (Is_Protected_Interface (T) - or else Is_Synchronized_Interface (T) - or else Is_Task_Interface (T)); + return Is_Protected_Interface (T) + or else Is_Synchronized_Interface (T) + or else Is_Task_Interface (T); end Is_Concurrent_Interface; -----------------------
reply other threads:[~2021-07-05 13:15 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210705131515.01B043857433@sourceware.org \ --to=pmderodat@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).