From 05cf31d198b562b133286f6dacec4b92a4692079 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Mon, 19 Apr 2004 18:12:00 +0000 Subject: [PATCH] * dwarf2read.c (dwarf2_flag_true_p): New function. (die_is_declaration): Use the function above. Add some comments. --- gdb/ChangeLog | 5 +++++ gdb/dwarf2read.c | 26 ++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 790021267f2..67d4fe6fe4b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2004-04-19 Joel Brobecker + + * dwarf2read.c (dwarf2_flag_true_p): New function. + (die_is_declaration): Use the function above. Add some comments. + 2004-04-19 Mark Kettenis * sparcnbsd-tdep.c (_initialize_sparnbsd_tdep): Specify diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index acbcecebef5..a000a2a2c17 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -732,6 +732,9 @@ static void set_cu_language (unsigned int, struct dwarf2_cu *); static struct attribute *dwarf2_attr (struct die_info *, unsigned int, struct dwarf2_cu *); +static int dwarf2_flag_true_p (struct die_info *die, unsigned name, + struct dwarf2_cu *cu); + static int die_is_declaration (struct die_info *, struct dwarf2_cu *cu); static struct die_info *die_specification (struct die_info *die, @@ -5549,11 +5552,30 @@ dwarf2_attr (struct die_info *die, unsigned int name, struct dwarf2_cu *cu) return NULL; } +/* Return non-zero iff the attribute NAME is defined for the given DIE, + and holds a non-zero value. This function should only be used for + DW_FORM_flag attributes. */ + +static int +dwarf2_flag_true_p (struct die_info *die, unsigned name, struct dwarf2_cu *cu) +{ + struct attribute *attr = dwarf2_attr (die, name, cu); + + return (attr && DW_UNSND (attr)); +} + static int die_is_declaration (struct die_info *die, struct dwarf2_cu *cu) { - return (dwarf2_attr (die, DW_AT_declaration, cu) - && ! dwarf2_attr (die, DW_AT_specification, cu)); + /* A DIE is a declaration if it has a DW_AT_declaration attribute + which value is non-zero. However, we have to be careful with + DIEs having a DW_AT_specification attribute, because dwarf2_attr() + (via dwarf2_flag_true_p) follows this attribute. So we may + end up accidently finding a declaration attribute that belongs + to a different DIE referenced by the specification attribute, + even though the given DIE does not have a declaration attribute. */ + return (dwarf2_flag_true_p (die, DW_AT_declaration, cu) + && dwarf2_attr (die, DW_AT_specification, cu) == NULL); } /* Return the die giving the specification for DIE, if there is -- 2.30.2