diff options
| author | Ed Schonberg <schonberg@adacore.com> | 2019-07-03 08:14:47 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2019-07-03 08:14:47 +0000 |
| commit | 558241c0f71b4171c471100631af79aa93c0a9e7 (patch) | |
| tree | febc39487c3b4c48efa51fd799c36db4c0f6b5fd /gcc/ada | |
| parent | b5c8da6bac845e685236eeedc02f0814c05ed42f (diff) | |
| download | gcc-558241c0f71b4171c471100631af79aa93c0a9e7.zip gcc-558241c0f71b4171c471100631af79aa93c0a9e7.tar.gz gcc-558241c0f71b4171c471100631af79aa93c0a9e7.tar.bz2 | |
[Ada] Spurious error with static predicate in generic unit
This patch fixes a spurious error in a generic unit that invludes a
subtype with a static predicate, when the type is used in a case
expression.
2019-07-03 Ed Schonberg <schonberg@adacore.com>
gcc/ada/
* sem_ch13.adb (Build_Predicate_Functions): In a generic context
we do not build the bodies of predicate fuctions, but the
expression in a static predicate must be elaborated to allow
case coverage checking within the generic unit.
(Build_Discrete_Static_Predicate): In a generic context, return
without building function body once the
Static_Discrete_Predicate expression for the type has been
constructed.
gcc/testsuite/
* gnat.dg/predicate6.adb, gnat.dg/predicate6.ads: New testcase.
* gnat.dg/static_pred1.adb: Remove expected error.
From-SVN: r272974
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/ada/sem_ch13.adb | 15 |
2 files changed, 24 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 7879ba2..6326e7c 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,14 @@ +2019-07-03 Ed Schonberg <schonberg@adacore.com> + + * sem_ch13.adb (Build_Predicate_Functions): In a generic context + we do not build the bodies of predicate fuctions, but the + expression in a static predicate must be elaborated to allow + case coverage checking within the generic unit. + (Build_Discrete_Static_Predicate): In a generic context, return + without building function body once the + Static_Discrete_Predicate expression for the type has been + constructed. + 2019-07-03 Hristian Kirtchev <kirtchev@adacore.com> * bindgen.adb, inline.adb, layout.adb, sem_ch12.adb, diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 234177f..6d9b09d 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -8201,6 +8201,13 @@ package body Sem_Ch13 is Set_Static_Discrete_Predicate (Typ, Plist); + -- Within a generic the predicate functions themselves need not + -- be constructed. + + if Inside_A_Generic then + return; + end if; + -- The processing for static predicates put the expression into -- canonical form as a series of ranges. It also eliminated -- duplicates and collapsed and combined ranges. We might as well @@ -8733,9 +8740,13 @@ package body Sem_Ch13 is -- Do not generate predicate bodies within a generic unit. The -- expressions have been analyzed already, and the bodies play - -- no role if not within an executable unit. + -- no role if not within an executable unit. However, if a statc + -- predicate is present it must be processed for legality checks + -- such as case coverage in an expression. - elsif Inside_A_Generic then + elsif Inside_A_Generic + and then not Has_Static_Predicate_Aspect (Typ) + then return; end if; |