diff options
author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2014-12-13 15:31:59 +0100 |
---|---|---|
committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2014-12-13 15:31:59 +0100 |
commit | 5537b577695dd5cd72395590d7ebd7aa92ee856a (patch) | |
tree | e6056d71387242223a6d42b4b8d384c9c07612e0 /gdb/gdbtypes.c | |
parent | 14aba1ac0d583ebd77b7645f88308d75c0a69d0f (diff) | |
download | binutils-gdb-5537b577695dd5cd72395590d7ebd7aa92ee856a.tar.gz |
Fix 7.8 regression: resolve_dynamic_struct: Assertion `TYPE_NFIELDS (type) > 0' (PR 17642)
https://sourceware.org/bugzilla/show_bug.cgi?id=17642
Regression since:
commit 012370f6818657a816df1463ee71ca4e4ee40b33
Author: Tom Tromey <tromey@redhat.com>
Date: Thu May 8 11:26:44 2014 -0600
handle VLA in a struct or union
Bugreport:
Regression with gdb scripts for Linux kernel
https://sourceware.org/ml/gdb/2014-08/msg00127.html
That big change after "else" is just reindentation.
gdb/ChangeLog
2014-12-13 Jan Kratochvil <jan.kratochvil@redhat.com>
PR symtab/17642
* gdbtypes.c (resolve_dynamic_type_internal): Apply check_typedef to
TYPE if not TYPE_CODE_TYPEDEF.
gdb/testsuite/ChangeLog
2014-12-13 Jan Kratochvil <jan.kratochvil@redhat.com>
PR symtab/17642
* gdb.base/vla-stub-define.c: New file.
* gdb.base/vla-stub.c: New file.
* gdb.base/vla-stub.exp: New file.
Diffstat (limited to 'gdb/gdbtypes.c')
-rw-r--r-- | gdb/gdbtypes.c | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 7d842e97d1e..c5a390a9533 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1888,41 +1888,47 @@ resolve_dynamic_type_internal (struct type *type, CORE_ADDR addr, if (!is_dynamic_type_internal (real_type, top_level)) return type; - switch (TYPE_CODE (type)) + if (TYPE_CODE (type) == TYPE_CODE_TYPEDEF) { - case TYPE_CODE_TYPEDEF: resolved_type = copy_type (type); TYPE_TARGET_TYPE (resolved_type) = resolve_dynamic_type_internal (TYPE_TARGET_TYPE (type), addr, top_level); - break; + } + else + { + /* Before trying to resolve TYPE, make sure it is not a stub. */ + type = real_type; - case TYPE_CODE_REF: - { - CORE_ADDR target_addr = read_memory_typed_address (addr, type); + switch (TYPE_CODE (type)) + { + case TYPE_CODE_REF: + { + CORE_ADDR target_addr = read_memory_typed_address (addr, type); - resolved_type = copy_type (type); - TYPE_TARGET_TYPE (resolved_type) - = resolve_dynamic_type_internal (TYPE_TARGET_TYPE (type), - target_addr, top_level); - break; - } + resolved_type = copy_type (type); + TYPE_TARGET_TYPE (resolved_type) + = resolve_dynamic_type_internal (TYPE_TARGET_TYPE (type), + target_addr, top_level); + break; + } - case TYPE_CODE_ARRAY: - resolved_type = resolve_dynamic_array (type, addr); - break; + case TYPE_CODE_ARRAY: + resolved_type = resolve_dynamic_array (type, addr); + break; - case TYPE_CODE_RANGE: - resolved_type = resolve_dynamic_range (type, addr); - break; + case TYPE_CODE_RANGE: + resolved_type = resolve_dynamic_range (type, addr); + break; - case TYPE_CODE_UNION: - resolved_type = resolve_dynamic_union (type, addr); - break; + case TYPE_CODE_UNION: + resolved_type = resolve_dynamic_union (type, addr); + break; - case TYPE_CODE_STRUCT: - resolved_type = resolve_dynamic_struct (type, addr); - break; + case TYPE_CODE_STRUCT: + resolved_type = resolve_dynamic_struct (type, addr); + break; + } } /* Resolve data_location attribute. */ |