diff options
| author | Ed Schonberg <schonberg@adacore.com> | 2018-12-11 11:12:16 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2018-12-11 11:12:16 +0000 |
| commit | 2f42b6ead47da2c5d863042de6689aee64d342b3 (patch) | |
| tree | 4b060a6eb32f2e547780008fcbf8b8a096c468d8 /gcc/ada | |
| parent | 155f4f34d1f2e1d6ea4e82104f57be3d6eab78b2 (diff) | |
| download | gcc-2f42b6ead47da2c5d863042de6689aee64d342b3.zip gcc-2f42b6ead47da2c5d863042de6689aee64d342b3.tar.gz gcc-2f42b6ead47da2c5d863042de6689aee64d342b3.tar.bz2 | |
[Ada] Crash on misplaced First operation for GNAT iterable type
This patch improves the handling of an improper declaaration of aspect
First for a GNAT-defined iterable type,
2018-12-11 Ed Schonberg <schonberg@adacore.com>
gcc/ada/
* sem_util.adb (Get_Actual_Subtype): Function can return type
mark.
(Get_Cursor_Type): Improve recovery and error message on a
misplaced First aspect for an iterable type.
gcc/testsuite/
* gnat.dg/iter4.adb: New testcase.
From-SVN: r267013
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/sem_util.adb | 13 |
2 files changed, 19 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 3dc73b3..59d0a3f 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2018-12-11 Ed Schonberg <schonberg@adacore.com> + + * sem_util.adb (Get_Actual_Subtype): Function can return type + mark. + (Get_Cursor_Type): Improve recovery and error message on a + misplaced First aspect for an iterable type. + 2018-12-11 Hristian Kirtchev <kirtchev@adacore.com> * checks.adb: Add with and use clauses for Sem_Mech. diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 4f8bec3..afb0b71 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -9049,6 +9049,13 @@ package body Sem_Util is else Decl := Build_Actual_Subtype (Typ, N); + + -- The call may yield a declaration, or just return the entity + + if Decl = Typ then + return Typ; + end if; + Atyp := Defining_Identifier (Decl); -- If Build_Actual_Subtype generated a new declaration then use it @@ -9162,6 +9169,9 @@ package body Sem_Util is if First_Op = Any_Id then Error_Msg_N ("aspect Iterable must specify First operation", Aspect); return Any_Type; + + elsif not Analyzed (First_Op) then + Analyze (First_Op); end if; Cursor := Any_Type; @@ -9195,7 +9205,8 @@ package body Sem_Util is if Cursor = Any_Type then Error_Msg_N - ("No legal primitive operation First for Iterable type", Aspect); + ("primitive operation for Iterable type must appear " + & "in the same list of declarations as the type", Aspect); end if; return Cursor; |