diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 52 | ||||
| -rw-r--r-- | gdb/gdbtypes.c | 4 |
3 files changed, 47 insertions, 18 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 37e25a3..d180e38 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2015-04-27 Pierre-Marie de Rodat <derodat@adacore.com> + + * ada-lang.c (template_to_static_fixed_type): Return input type + when it is already fixed. Cache the input type itself when not + creating a static fixed copy. Make it explicit that we never + molestate the input type. + * gdbtypes.c (resolve_dynamic_struct): Reset the + TYPE_TARGET_TYPE field for resolved copies. + 2015-04-27 Joel Brobecker <brobecker@adacore.com> * ada-lang.c (ada_is_tagged_type): Add call to ada_check_typedef. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index e147d5a..d034049 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -8171,11 +8171,21 @@ template_to_static_fixed_type (struct type *type0) int nfields; int f; + /* No need no do anything if the input type is already fixed. */ + if (TYPE_FIXED_INSTANCE (type0)) + return type0; + + /* Likewise if we already have computed the static approximation. */ if (TYPE_TARGET_TYPE (type0) != NULL) return TYPE_TARGET_TYPE (type0); - nfields = TYPE_NFIELDS (type0); + /* Don't clone TYPE0 until we are sure we are going to need a copy. */ type = type0; + nfields = TYPE_NFIELDS (type0); + + /* Whether or not we cloned TYPE0, cache the result so that we don't do + recompute all over next time. */ + TYPE_TARGET_TYPE (type0) = type; for (f = 0; f < nfields; f += 1) { @@ -8189,24 +8199,30 @@ template_to_static_fixed_type (struct type *type0) } else new_type = static_unwrap_type (field_type); - if (type == type0 && new_type != field_type) - { - TYPE_TARGET_TYPE (type0) = type = alloc_type_copy (type0); - TYPE_CODE (type) = TYPE_CODE (type0); - INIT_CPLUS_SPECIFIC (type); - TYPE_NFIELDS (type) = nfields; - TYPE_FIELDS (type) = (struct field *) - TYPE_ALLOC (type, nfields * sizeof (struct field)); - memcpy (TYPE_FIELDS (type), TYPE_FIELDS (type0), - sizeof (struct field) * nfields); - TYPE_NAME (type) = ada_type_name (type0); - TYPE_TAG_NAME (type) = NULL; - TYPE_FIXED_INSTANCE (type) = 1; - TYPE_LENGTH (type) = 0; - } - TYPE_FIELD_TYPE (type, f) = new_type; - TYPE_FIELD_NAME (type, f) = TYPE_FIELD_NAME (type0, f); + + if (new_type != field_type) + { + /* Clone TYPE0 only the first time we get a new field type. */ + if (type == type0) + { + TYPE_TARGET_TYPE (type0) = type = alloc_type_copy (type0); + TYPE_CODE (type) = TYPE_CODE (type0); + INIT_CPLUS_SPECIFIC (type); + TYPE_NFIELDS (type) = nfields; + TYPE_FIELDS (type) = (struct field *) + TYPE_ALLOC (type, nfields * sizeof (struct field)); + memcpy (TYPE_FIELDS (type), TYPE_FIELDS (type0), + sizeof (struct field) * nfields); + TYPE_NAME (type) = ada_type_name (type0); + TYPE_TAG_NAME (type) = NULL; + TYPE_FIXED_INSTANCE (type) = 1; + TYPE_LENGTH (type) = 0; + } + TYPE_FIELD_TYPE (type, f) = new_type; + TYPE_FIELD_NAME (type, f) = TYPE_FIELD_NAME (type0, f); + } } + return type; } diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 103b4e2..b2e1177 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -2013,6 +2013,10 @@ resolve_dynamic_struct (struct type *type, TYPE_LENGTH (resolved_type) = (resolved_type_bit_length + TARGET_CHAR_BIT - 1) / TARGET_CHAR_BIT; + /* The Ada language uses this field as a cache for static fixed types: reset + it as RESOLVED_TYPE must have its own static fixed type. */ + TYPE_TARGET_TYPE (resolved_type) = NULL; + return resolved_type; } |