diff options
Diffstat (limited to 'gcc/ada/gcc-interface')
| -rw-r--r-- | gcc/ada/gcc-interface/decl.c | 14 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/gigi.h | 4 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/trans.c | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 57dfff1..8fa7349 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -98,7 +98,7 @@ struct incomplete static int defer_incomplete_level = 0; static struct incomplete *defer_incomplete_list; -/* This variable is used to delay expanding From_With_Type types until the +/* This variable is used to delay expanding From_Limited_With types until the end of the spec. */ static struct incomplete *defer_limited_with; @@ -3738,7 +3738,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) /* Whether it comes from a limited with. */ bool is_from_limited_with = (IN (Ekind (gnat_desig_equiv), Incomplete_Kind) - && From_With_Type (gnat_desig_equiv)); + && From_Limited_With (gnat_desig_equiv)); /* The "full view" of the designated type. If this is an incomplete entity from a limited with, treat its non-limited view as the full view. Otherwise, if this is an incomplete or private type, use the @@ -4230,7 +4230,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) we are only annotating types, break circularities here. */ if (type_annotate_only && IN (Ekind (gnat_return_type), Incomplete_Kind) - && From_With_Type (gnat_return_type) + && From_Limited_With (gnat_return_type) && In_Extended_Main_Code_Unit (Non_Limited_View (gnat_return_type)) && !present_gnu_tree (Non_Limited_View (gnat_return_type))) @@ -4343,7 +4343,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) we are only annotating types, break circularities here. */ if (type_annotate_only && IN (Ekind (gnat_param_type), Incomplete_Kind) - && From_With_Type (Etype (gnat_param_type)) + && From_Limited_With (Etype (gnat_param_type)) && In_Extended_Main_Code_Unit (Non_Limited_View (gnat_param_type)) && !present_gnu_tree (Non_Limited_View (gnat_param_type))) @@ -4738,7 +4738,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) full view, whichever is present. This is used in all the tests below. */ Entity_Id full_view - = (IN (kind, Incomplete_Kind) && From_With_Type (gnat_entity)) + = (IN (kind, Incomplete_Kind) && From_Limited_With (gnat_entity)) ? Non_Limited_View (gnat_entity) : Present (Full_View (gnat_entity)) ? Full_View (gnat_entity) @@ -5490,10 +5490,10 @@ is_cplusplus_method (Entity_Id gnat_entity) return false; } -/* Finalize the processing of From_With_Type incomplete types. */ +/* Finalize the processing of From_Limited_With incomplete types. */ void -finalize_from_with_types (void) +finalize_from_limited_with (void) { struct incomplete *p, *next; diff --git a/gcc/ada/gcc-interface/gigi.h b/gcc/ada/gcc-interface/gigi.h index ca29737..832803c 100644 --- a/gcc/ada/gcc-interface/gigi.h +++ b/gcc/ada/gcc-interface/gigi.h @@ -93,8 +93,8 @@ do { \ mark_visited (EXP); \ } while (0) -/* Finalize the processing of From_With_Type incomplete types. */ -extern void finalize_from_with_types (void); +/* Finalize the processing of From_Limited_With incomplete types. */ +extern void finalize_from_limited_with (void); /* Return the equivalent type to be used for GNAT_ENTITY, if it's a kind of type (such E_Task_Type) that has a different type which Gigi diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index 9ed804e..388345f 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -5009,7 +5009,7 @@ Compilation_Unit_to_gnu (Node_Id gnat_node) /* Process any pragmas and actions following the unit. */ add_stmt_list (Pragmas_After (Aux_Decls_Node (gnat_node))); add_stmt_list (Actions (Aux_Decls_Node (gnat_node))); - finalize_from_with_types (); + finalize_from_limited_with (); /* Save away what we've made so far and record this potential elaboration procedure. */ @@ -6629,7 +6629,7 @@ gnat_to_gnu (Node_Id gnat_node) Present (gnat_temp); gnat_temp = Next_Formal_With_Extras (gnat_temp)) if (Is_Itype (Etype (gnat_temp)) - && !From_With_Type (Etype (gnat_temp))) + && !From_Limited_With (Etype (gnat_temp))) gnat_to_gnu_entity (Etype (gnat_temp), NULL_TREE, 0); /* Then the result type, set to Standard_Void_Type for procedures. */ @@ -6637,7 +6637,7 @@ gnat_to_gnu (Node_Id gnat_node) Entity_Id gnat_temp_type = Etype (Defining_Entity (Specification (gnat_node))); - if (Is_Itype (gnat_temp_type) && !From_With_Type (gnat_temp_type)) + if (Is_Itype (gnat_temp_type) && !From_Limited_With (gnat_temp_type)) gnat_to_gnu_entity (Etype (gnat_temp_type), NULL_TREE, 0); } |