diff options
| author | Javier Miranda <miranda@adacore.com> | 2018-07-16 14:10:13 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2018-07-16 14:10:13 +0000 |
| commit | 9f46106adeafd23cb34921e8aa97cb02bf30a760 (patch) | |
| tree | fb20da4f42958db2239ecfbd2cb849c0fe2926d7 | |
| parent | 97710dc73178bb3a45712d69c9dcefc66bc3fb5f (diff) | |
| download | gcc-9f46106adeafd23cb34921e8aa97cb02bf30a760.zip gcc-9f46106adeafd23cb34921e8aa97cb02bf30a760.tar.gz gcc-9f46106adeafd23cb34921e8aa97cb02bf30a760.tar.bz2 | |
[Ada] Sem_Ch4: minor code cleanup
2018-07-16 Javier Miranda <miranda@adacore.com>
gcc/ada/
* sem_ch4.adb (Analyze_Membership_Op): Code cleanup.
From-SVN: r262704
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 <miranda@adacore.com> + * sem_ch4.adb (Analyze_Membership_Op): Code cleanup. + +2018-07-16 Javier Miranda <miranda@adacore.com> + * 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; |