FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 7.8 regression: resolve_dynamic_struct: Assertion `TYPE_NFIELDS (type) > 0' (PR 17642)

Browse source 
https://sourceware.org/bugzilla/show_bug.cgi?id=17642

Regression since:
commit 012370f681
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.
This commit is contained in:
Jan Kratochvil 2014-12-13 15:31:59 +01:00
parent 14aba1ac0d
commit 5537b57769
6 changed files with 126 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

54
gdb/gdbtypes.c
View file

@ -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. */