This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: recursive bug in dwarf2read.c
- From: Gaius Mulley <gaius at glam dot ac dot uk>
- To: tromey at redhat dot com
- Cc: gdb-patches at sourceware dot org, drow at false dot org
- Date: Fri, 11 Dec 2009 20:56:18 +0000
- Subject: Re: recursive bug in dwarf2read.c
- References: <878wdcto0t.fsf@j228-gm.comp.glam.ac.uk> <20091209185157.GA29691@caradoc.them.org> <87pr6mliuh.fsf@j228-gm.comp.glam.ac.uk> <m3d42lz4w0.fsf@fleche.redhat.com>
Tom Tromey <tromey@redhat.com> writes:
>>>>>> "Gaius" == Gaius Mulley <gaius@glam.ac.uk> writes:
>
> Gaius> 2009-12-10 Gaius Mulley <gaius@glam.ac.uk>
> Gaius> * dwarf2read.c (read_subroutine_type): Add the subroutine
> Gaius> type to the die immediately to allow a parameter type to be
> Gaius> the same subroutine type.
>
> This seems almost ok to me.
>
> With this change, read_subroutine_type calls set_die_type twice.
> I think it would be preferable to eliminate the second call.
Hi Tom,
ahh yes - true, here is the modified patch without the redundant
second call:
--- src-orig/gdb/dwarf2read.c 2009-12-10 16:41:40.000000000 +0000
+++ src/gdb/dwarf2read.c 2009-12-11 20:31:52.000000000 +0000
@@ -5879,6 +5879,11 @@
the default value DW_CC_normal. */
attr = dwarf2_attr (die, DW_AT_calling_convention, cu);
TYPE_CALLING_CONVENTION (ftype) = attr ? DW_UNSND (attr) : DW_CC_normal;
+
+ /* We need to add the subroutine type to the die immediately so
+ we don't infinitely recurse when dealing with parameters
+ declared as the same subroutine type. */
+ set_die_type (die, ftype, cu);
if (die->child != NULL)
{
@@ -5926,7 +5931,7 @@
}
}
- return set_die_type (die, ftype, cu);
+ return ftype;
}
static struct type *
2009-12-11 Gaius Mulley <gaius@glam.ac.uk>
* dwarf2read.c (read_subroutine_type): Add the subroutine
type to the die immediately to allow a parameter type to be
the same subroutine type.
regards,
Gaius