diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2021-04-30 12:02:35 +0200 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-07-05 13:09:15 +0000 |
| commit | 6cf7cc8ccf3a7f34c1772f8da11a1c127fee3363 (patch) | |
| tree | e1f64c1bfa938aa6cd263baffb07b72a64895eb4 /gcc | |
| parent | 0700922ea57258870047f210c3569b5deed1bf82 (diff) | |
| download | gcc-6cf7cc8ccf3a7f34c1772f8da11a1c127fee3363.zip gcc-6cf7cc8ccf3a7f34c1772f8da11a1c127fee3363.tar.gz gcc-6cf7cc8ccf3a7f34c1772f8da11a1c127fee3363.tar.bz2 | |
[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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/exp_ch3.adb | 7 | ||||
| -rw-r--r-- | gcc/ada/sem_ch3.adb | 8 | ||||
| -rw-r--r-- | gcc/ada/sem_ch6.adb | 5 | ||||
| -rw-r--r-- | 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 ce6d294..2f997a3 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 aa73f3a..95a27a2 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 3697aba..4b58d59 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 25060cc..ef575d0 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; ----------------------- |