diff options
Diffstat (limited to 'gcc/ada/gcc-interface/trans.c')
| -rw-r--r-- | gcc/ada/gcc-interface/trans.c | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index cca9523..9622625 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -6609,11 +6609,17 @@ process_freeze_entity (Node_Id gnat_node) && Root_Type (Class_Wide_Type (gnat_entity)) == gnat_entity) save_gnu_tree (Class_Wide_Type (gnat_entity), gnu_new, false); - /* If we've made any pointers to the old version of this type, we - have to update them. */ + /* If we have an old type and we've made pointers to this type, update those + pointers. If this is a Taft amendment type in the main unit, we need to + mark the type as used since other units referencing it don't see the full + declaration and, therefore, cannot mark it as used themselves. */ if (gnu_old) - update_pointer_to (TYPE_MAIN_VARIANT (TREE_TYPE (gnu_old)), - TREE_TYPE (gnu_new)); + { + update_pointer_to (TYPE_MAIN_VARIANT (TREE_TYPE (gnu_old)), + TREE_TYPE (gnu_new)); + if (DECL_TAFT_TYPE_P (gnu_old)) + used_types_insert (TREE_TYPE (gnu_new)); + } } /* Elaborate decls in the lists GNAT_DECLS and GNAT_DECLS2, if present. @@ -7456,7 +7462,11 @@ process_type (Entity_Id gnat_entity) save_gnu_tree (gnat_entity, gnu_decl, false); if (IN (Ekind (gnat_entity), Incomplete_Or_Private_Kind) && Present (Full_View (gnat_entity))) - save_gnu_tree (Full_View (gnat_entity), gnu_decl, false); + { + if (Has_Completion_In_Body (gnat_entity)) + DECL_TAFT_TYPE_P (gnu_decl) = 1; + save_gnu_tree (Full_View (gnat_entity), gnu_decl, false); + } } return; @@ -7478,11 +7488,17 @@ process_type (Entity_Id gnat_entity) gnu_new = gnat_to_gnu_entity (gnat_entity, NULL_TREE, 1); gcc_assert (TREE_CODE (gnu_new) == TYPE_DECL); - /* If we have an old type and we've made pointers to this type, - update those pointers. */ + /* If we have an old type and we've made pointers to this type, update those + pointers. If this is a Taft amendment type in the main unit, we need to + mark the type as used since other units referencing it don't see the full + declaration and, therefore, cannot mark it as used themselves. */ if (gnu_old) - update_pointer_to (TYPE_MAIN_VARIANT (TREE_TYPE (gnu_old)), - TREE_TYPE (gnu_new)); + { + update_pointer_to (TYPE_MAIN_VARIANT (TREE_TYPE (gnu_old)), + TREE_TYPE (gnu_new)); + if (DECL_TAFT_TYPE_P (gnu_old)) + used_types_insert (TREE_TYPE (gnu_new)); + } /* If this is a record type corresponding to a task or protected type that is a completion of an incomplete type, perform a similar update |