* dwarf2read.c (dwarf2_get_die_type): Call

get_die_type_at_offset.
	* dwarf2expr.c (dwarf_get_base_type): Handle NULL return from
	get_base_type function.
This commit is contained in:
Tom Tromey 2011-05-17 17:01:46 +00:00
parent 4e51152384
commit 9ff3b74fdb
3 changed files with 10 additions and 15 deletions

View File

@ -1,3 +1,10 @@
2011-05-17 Tom Tromey <tromey@redhat.com>
* dwarf2read.c (dwarf2_get_die_type): Call
get_die_type_at_offset.
* dwarf2expr.c (dwarf_get_base_type): Handle NULL return from
get_base_type function.
2011-05-17 Tomas Martinec <fyzmat@gmail.com>
* infrun.c (handle_inferior_event) <handling deferred step>: Clear

View File

@ -447,6 +447,8 @@ dwarf_get_base_type (struct dwarf_expr_context *ctx, ULONGEST die, int size)
if (ctx->get_base_type)
{
result = ctx->get_base_type (ctx, die);
if (result == NULL)
error (_("Could not find type for DW_OP_GNU_const_type"));
if (size != 0 && TYPE_LENGTH (result) != size)
error (_("DW_OP_GNU_const_type has different sizes for type and data"));
}

View File

@ -13671,22 +13671,8 @@ struct type *
dwarf2_get_die_type (unsigned int die_offset,
struct dwarf2_per_cu_data *per_cu)
{
struct dwarf2_cu *cu = per_cu->cu;
struct die_info *die;
struct type *result;
dw2_setup (per_cu->objfile);
die = follow_die_offset (die_offset, &cu);
if (!die)
error (_("Dwarf Error: Cannot find DIE at 0x%x referenced in module %s"),
die_offset, per_cu->cu->objfile->name);
result = get_die_type (die, cu);
if (result == NULL)
result = read_type_die_1 (die, cu);
return result;
return get_die_type_at_offset (die_offset, per_cu);
}
/* Follow the signature attribute ATTR in SRC_DIE.