diff options
author | Eric Botcazou <ebotcazou@adacore.com> | 2018-09-26 09:17:10 +0000 |
---|---|---|
committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2018-09-26 09:17:10 +0000 |
commit | 4453a8221c65f386ae361670fa932643521374d7 (patch) | |
tree | c850eabac3831d3e202d4306c31e234753c2d2d4 /gcc | |
parent | 81d85d4baeb6ada71652a556cec1663511c3933c (diff) | |
download | gcc-4453a8221c65f386ae361670fa932643521374d7.zip gcc-4453a8221c65f386ae361670fa932643521374d7.tar.gz gcc-4453a8221c65f386ae361670fa932643521374d7.tar.bz2 |
[Ada] ICE on array of task type with -gnatct
2018-09-26 Eric Botcazou <ebotcazou@adacore.com>
gcc/ada/
* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Task_Type>: In
-gnatct mode, process the discriminants only for a definition.
From-SVN: r264610
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/ada/gcc-interface/decl.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 83685b4..a0252f8 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,10 @@ 2018-09-26 Eric Botcazou <ebotcazou@adacore.com> + * gcc-interface/decl.c (gnat_to_gnu_entity) <E_Task_Type>: In + -gnatct mode, process the discriminants only for a definition. + +2018-09-26 Eric Botcazou <ebotcazou@adacore.com> + * repinfo.adb (List_Record_Layout): Be prepared for JSON output. (List_Record_Info): Use the flat representation for record subtypes in the JSON format. diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index c15b0c8..8dd62f7 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -4158,7 +4158,8 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) part of the associated body so they need to be translated. */ if (type_annotate_only && gnat_equiv_type == gnat_entity) { - if (Has_Discriminants (gnat_entity) + if (definition + && Has_Discriminants (gnat_entity) && Root_Type (gnat_entity) == gnat_entity) { tree gnu_field_list = NULL_TREE; |