From 9f46106adeafd23cb34921e8aa97cb02bf30a760 Mon Sep 17 00:00:00 2001 From: Javier Miranda Date: Mon, 16 Jul 2018 14:10:13 +0000 Subject: [PATCH] [Ada] Sem_Ch4: minor code cleanup 2018-07-16 Javier Miranda gcc/ada/ * sem_ch4.adb (Analyze_Membership_Op): Code cleanup. From-SVN: r262704 --- gcc/ada/ChangeLog | 4 ++++ gcc/ada/sem_ch4.adb | 12 +++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 5e2ae1f..f692dd8 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,9 @@ 2018-07-16 Javier Miranda + * sem_ch4.adb (Analyze_Membership_Op): Code cleanup. + +2018-07-16 Javier Miranda + * exp_attr.adb (Expand_N_Attribute_Reference ['Count]): Do not transform 'Count into a function call if the current scope has been eliminated. diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index 1b8d8cb..def317d9 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -3031,15 +3031,9 @@ package body Sem_Ch4 is Analyze_Expression (L); if No (R) then - if Ada_Version >= Ada_2012 then - Analyze_Set_Membership; - Check_Function_Writable_Actuals (N); - else - Error_Msg_N - ("multiple choices in membership tests only allowed in Ada 2012", - N); - end if; - + pragma Assert (Ada_Version >= Ada_2012); + Analyze_Set_Membership; + Check_Function_Writable_Actuals (N); return; end if; -- 2.7.4