diff options
Diffstat (limited to 'gcc/ada/gcc-interface/decl.c')
| -rw-r--r-- | gcc/ada/gcc-interface/decl.c | 78 |
1 files changed, 43 insertions, 35 deletions
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 10e9c8d..55f8681 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -1379,6 +1379,49 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) const_flag = true; } + /* If this is an aliased object with an unconstrained nominal subtype, + we make its type a thin reference, i.e. the reference counterpart + of a thin pointer, so that it points to the array part. This is + aimed at making it easier for the debugger to decode the object. + Note that we have to do that this late because of the couple of + allocation adjustments that might be made just above. */ + if (Is_Constr_Subt_For_UN_Aliased (Etype (gnat_entity)) + && Is_Array_Type (Etype (gnat_entity)) + && !type_annotate_only) + { + tree gnu_array + = gnat_to_gnu_type (Base_Type (Etype (gnat_entity))); + + /* In case the object with the template has already been allocated + just above, we have nothing to do here. */ + if (!TYPE_IS_THIN_POINTER_P (gnu_type)) + { + gnu_size = NULL_TREE; + used_by_ref = true; + + if (definition && !imported_p) + { + tree gnu_unc_var + = create_var_decl (concat_name (gnu_entity_name, "UNC"), + NULL_TREE, gnu_type, gnu_expr, + const_flag, Is_Public (gnat_entity), + false, static_p, NULL, gnat_entity); + gnu_expr + = build_unary_op (ADDR_EXPR, NULL_TREE, gnu_unc_var); + TREE_CONSTANT (gnu_expr) = 1; + const_flag = true; + } + else + { + gnu_expr = NULL_TREE; + const_flag = false; + } + } + + gnu_type + = build_reference_type (TYPE_OBJECT_RECORD_TYPE (gnu_array)); + } + if (const_flag) gnu_type = build_qualified_type (gnu_type, (TYPE_QUALS (gnu_type) | TYPE_QUAL_CONST)); @@ -1469,41 +1512,6 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) } } - /* If this is an aliased object with an unconstrained nominal subtype - and optimization isn't enabled, create a VAR_DECL for debugging - purposes whose type is a thin reference (the reference counterpart - of a thin pointer), so that it will be directly initialized to the - address of the array part. */ - else if (Is_Constr_Subt_For_UN_Aliased (Etype (gnat_entity)) - && Is_Array_Type (Etype (gnat_entity)) - && !type_annotate_only - && !optimize - && debug_info_p) - { - tree gnu_array - = gnat_to_gnu_type (Base_Type (Etype (gnat_entity))); - tree gnu_thin_type - = build_reference_type (TYPE_OBJECT_RECORD_TYPE (gnu_array)); - tree gnu_ref, gnu_debug_decl; - - /* In case the object with the template has already been indirectly - allocated, we have nothing to do here. */ - if (TYPE_IS_THIN_POINTER_P (gnu_type)) - gnu_ref = gnu_decl; - else - gnu_ref = build_unary_op (ADDR_EXPR, NULL_TREE, gnu_decl); - gnu_ref = convert (gnu_thin_type, gnu_ref); - - gnu_debug_decl - = create_var_decl (gnu_entity_name, gnu_ext_name, - gnu_thin_type, NULL_TREE, const_flag, - Is_Public (gnat_entity), !definition, - static_p, attr_list, gnat_entity); - SET_DECL_VALUE_EXPR (gnu_debug_decl, gnu_ref); - DECL_HAS_VALUE_EXPR_P (gnu_debug_decl) = 1; - DECL_IGNORED_P (gnu_decl) = 1; - } - /* If this is a constant and we are defining it or it generates a real symbol at the object level and we are referencing it, we may want or need to have a true variable to represent it: |