diff options
| author | Ed Schonberg <schonberg@adacore.com> | 2020-12-20 20:18:33 -0500 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-05-03 05:28:20 -0400 |
| commit | 03c80e174bc059b50063da24cf89b67e692bc5d8 (patch) | |
| tree | 0954900d1c2c73bc1ac2c44bf8ab1dc1d85c25f4 | |
| parent | 54b20ee0acf9aeffb71333df9cf07a1c9c6d7d58 (diff) | |
| download | gcc-03c80e174bc059b50063da24cf89b67e692bc5d8.zip gcc-03c80e174bc059b50063da24cf89b67e692bc5d8.tar.gz gcc-03c80e174bc059b50063da24cf89b67e692bc5d8.tar.bz2 | |
[Ada] Compiler aborts on a constrained subtype of a predicated type
gcc/ada/
* sem_util.adb (Build_Constrained_Itype): Remove prior patch,
issue is better handled in Sem_Ch13.Build_Predicate_Functions.
* sem_ch13.adb (Build_Predicate_Functions): Do not build
predicate function for an Itype with a defined
Predicated_Parent, even if that designated parent does not yet
have a Predicate_Function. This can happen in instance bodies
nested within a generic unit.
| -rw-r--r-- | gcc/ada/sem_ch13.adb | 14 | ||||
| -rw-r--r-- | gcc/ada/sem_util.adb | 8 |
2 files changed, 13 insertions, 9 deletions
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index c863154..005c7b0 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -9976,11 +9976,23 @@ package body Sem_Ch13 is -- Start of processing for Build_Predicate_Functions begin - -- Return if already built or if type does not have predicates + -- Return if already built, if type does not have predicates, + -- or if type is a constructed subtype that will inherit a + -- predicate function from its ancestor. In a generic context + -- the predicated parent may not have a predicate function yet + -- but we don't want to build a new one for the subtype. This can + -- happen in an instance body which is nested within a generic + -- unit, in which case Within_A_Generic may be false, SId is + -- Empty, but uses of Typ will receive a predicate check in a + -- context where expansion and tests are enabled. SId := Predicate_Function (Typ); if not Has_Predicates (Typ) or else (Present (SId) and then Has_Completion (SId)) + or else + (Is_Itype (Typ) + and then not Comes_From_Source (Typ) + and then Present (Predicated_Parent (Typ))) then return; diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index a64cbde..b7b622d 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -2380,14 +2380,6 @@ package body Sem_Util is Analyze (Subtyp_Decl, Suppress => All_Checks); - -- In addition, inhibit the generation of predicate functions for - -- this subtype, because its declaration is not in a declarative - -- list, and no predicates apply to the aggregate itself, but only - -- to the object to which it may be assigned. - - Set_Has_Dynamic_Predicate_Aspect (Def_Id, False); - Set_Has_Predicates (Def_Id, False); - Set_Etype (N, Def_Id); end Build_Constrained_Itype; |