From a879b2501e61ee3d3efadbdb6b33212b57d3a2e1 Mon Sep 17 00:00:00 2001 From: Bernhard Heckel Date: Tue, 12 Jul 2016 08:19:34 +0200 Subject: [PATCH 2/7] Fortran: Resolve dynamic properties of pointer types. In Fortran a pointer may have a dynamic associated property. 2016-07-08 Bernhard Heckel gdb/Changelog: * gdbtypes.c (resolve_dynamic_types_internal): Resolve pointer types. (resolve_dynamic_pointer): New. Change-Id: Ie4b9d6397cfa089ee2e0db02beb18415a751c1c0 --- gdb/gdbtypes.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index ec5c17a..b53e649 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1806,7 +1806,8 @@ is_dynamic_type_internal (struct type *type, int top_level) type = check_typedef (type); /* We only want to recognize references at the outermost level. */ - if (top_level && TYPE_CODE (type) == TYPE_CODE_REF) + if (top_level && + (TYPE_CODE (type) == TYPE_CODE_REF || TYPE_CODE (type) == TYPE_CODE_PTR)) type = check_typedef (TYPE_TARGET_TYPE (type)); /* Types that have a dynamic TYPE_DATA_LOCATION are considered @@ -2105,6 +2106,28 @@ resolve_dynamic_struct (struct type *type, return resolved_type; } +/* Worker for pointer types. */ + +static struct type * +resolve_dynamic_pointer (struct type *type, + struct property_addr_info *addr_stack) +{ + struct dynamic_prop *prop; + CORE_ADDR value; + + type = copy_type (type); + + /* Resolve associated property. */ + prop = TYPE_ASSOCIATED_PROP (type); + if (prop != NULL && dwarf2_evaluate_property (prop, NULL, addr_stack, &value)) + { + TYPE_DYN_PROP_ADDR (prop) = value; + TYPE_DYN_PROP_KIND (prop) = PROP_CONST; + } + + return type; +} + /* Worker for resolved_dynamic_type. */ static struct type * @@ -2153,6 +2176,10 @@ resolve_dynamic_type_internal (struct type *type, break; } + case TYPE_CODE_PTR: + resolved_type = resolve_dynamic_pointer (type, addr_stack); + break; + case TYPE_CODE_ARRAY: resolved_type = resolve_dynamic_array (type, addr_stack); break; -- 2.7.4