diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2022-02-10 12:37:56 +0100 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2022-05-19 14:05:32 +0000 |
| commit | dfbdd4b9812b199a74dbb948b4eb54fb7bb30883 (patch) | |
| tree | 607ee7b249d4cc2b8e79fbcfccaac02c2a8a1f58 /gcc | |
| parent | 4d98c670fa97d203297f14ad270fd5d9e6f3f4d5 (diff) | |
| download | gcc-dfbdd4b9812b199a74dbb948b4eb54fb7bb30883.zip gcc-dfbdd4b9812b199a74dbb948b4eb54fb7bb30883.tar.gz gcc-dfbdd4b9812b199a74dbb948b4eb54fb7bb30883.tar.bz2 | |
[Ada] Fix for internal error on semi-circular record aggregate
This creates a couple of record subtypes pointing to each other through
access subtypes, and we break the circularity at the latter subtypes.
gcc/ada/
* gcc-interface/decl.cc (gnat_to_gnu_entity) <E_Record_Subtype>: If
it is a special subtype designated by an access subtype, then defer
the completion of incomplete types.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/gcc-interface/decl.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc index c096b0d..075a7eb 100644 --- a/gcc/ada/gcc-interface/decl.cc +++ b/gcc/ada/gcc-interface/decl.cc @@ -2134,6 +2134,8 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) suppress expanding incomplete types. */ gnu_type = make_node (UNCONSTRAINED_ARRAY_TYPE); + /* The component may refer to this type, so defer completion of any + incomplete types. */ if (!definition) { defer_incomplete_level++; @@ -3066,7 +3068,8 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) process_attributes (&gnu_type, &attr_list, true, gnat_entity); - /* If we are not defining it, suppress expanding incomplete types. */ + /* Some component may refer to this type, so defer completion of any + incomplete types. */ if (!definition) { defer_incomplete_level++; @@ -3439,7 +3442,14 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) { Entity_Id gnat_base_type = Implementation_Base_Type (gnat_entity); - if (!definition) + /* Some component may refer to this type, so defer completion of any + incomplete types. We also need to do it for the special subtypes + designated by access subtypes in case they are recursive, see the + E_Access_Subtype case below. */ + if (!definition + || (Is_Itype (gnat_entity) + && Is_Frozen (gnat_entity) + && No (Freeze_Node (gnat_entity)))) { defer_incomplete_level++; this_deferred = true; |