diff options
| author | Pierre-Marie de Rodat <derodat@adacore.com> | 2015-04-20 16:06:50 +0200 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2015-04-20 16:25:12 +0200 |
| commit | e771e4be1393b629bc243e2b5ee1e91850334d5a (patch) | |
| tree | 9fa9c7604c713420bd9d2e65bb65635acd95ba7a | |
| parent | ee715b5a6c88dcd7d81a44e57cb4dfe4790a4259 (diff) | |
| download | binutils-gdb-e771e4be1393b629bc243e2b5ee1e91850334d5a.tar.gz | |
Revert "Do not consider reference types as dynamic"
This reverts commit 961f41602529c9cd4f88af6c02fb61fb55100e27.
Note that the revert is partial: it keeps the new testcases
gdb.ada/funcall_ref.exp.
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/gdbtypes.c | 19 |
2 files changed, 28 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ea70a6b592a..d8aafa6bbb9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -2,6 +2,15 @@ Revert: 2015-04-03 Pierre-Marie de Rodat <derodat@adacore.com> + * gdbtypes.c (is_dynamic_type_internal): Remove special handling of + TYPE_CODE_REF types so that they are not considered as dynamic + depending on the referenced type. + (resolve_dynamic_type_internal): Likewise. + +2015-04-20 Pierre-Marie de Rodat <derodat@adacore.com> + + Revert: + 2015-04-03 Pierre-Marie de Rodat <derodat@adacore.com> * gdbtypes.c (is_dynamic_type_internal): Remove the unused "top_level" parameter. (resolve_dynamic_type_internal): Remove the unused "top_level" diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 6fb2e9a5f35..217ec7007e7 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1752,6 +1752,10 @@ 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) + type = check_typedef (TYPE_TARGET_TYPE (type)); + /* Types that have a dynamic TYPE_DATA_LOCATION are considered dynamic, even if the type itself is statically defined. From a user's point of view, this may appear counter-intuitive; @@ -2041,6 +2045,21 @@ resolve_dynamic_type_internal (struct type *type, switch (TYPE_CODE (type)) { + case TYPE_CODE_REF: + { + struct property_addr_info pinfo; + + pinfo.type = check_typedef (TYPE_TARGET_TYPE (type)); + pinfo.addr = read_memory_typed_address (addr_stack->addr, type); + pinfo.next = addr_stack; + + resolved_type = copy_type (type); + TYPE_TARGET_TYPE (resolved_type) + = resolve_dynamic_type_internal (TYPE_TARGET_TYPE (type), + &pinfo, top_level); + break; + } + case TYPE_CODE_ARRAY: resolved_type = resolve_dynamic_array (type, addr_stack); break; |