diff options
| author | Joel Brobecker <brobecker@gnat.com> | 2004-04-16 16:12:52 +0000 |
|---|---|---|
| committer | Joel Brobecker <brobecker@gnat.com> | 2004-04-16 16:12:52 +0000 |
| commit | 3e35c94c7b22f54b1b9a7b08765dffe1f574b3c1 (patch) | |
| tree | 6e15053fee651d7cb94536b9277e49afe261ad84 | |
| parent | 54fadb218ce1604980094829c61fd7b5077c6010 (diff) | |
| download | gdb-3e35c94c7b22f54b1b9a7b08765dffe1f574b3c1.tar.gz | |
* dwarf2read.c: Back out my previous change, it was incorrect.
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/dwarf2read.c | 24 |
2 files changed, 6 insertions, 22 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 89e06c715c2..92a43c532b1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2004-04-16 Joel Brobecker <brobecker@gnat.com> + + * dwarf2read.c: Back out my previous change, it was incorrect. + 2004-04-16 Daniel Jacobowitz <drow@mvista.com> * dwarf2read.c: Include "hashtab.h". diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 5fed47d4217..acbcecebef5 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -732,9 +732,6 @@ 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_attribute_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, @@ -5552,28 +5549,11 @@ 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. */ - -static int -dwarf2_attribute_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) { - /* A DIE is a declaration if it has a DW_AT_declaration attribute - which value is non-zero. However, we have to be careful of DIEs - with a DW_AT_specification attribute, because dwarf2_attribute_p() - follows this attribute, and therefore might cause us to find a - DW_AT_declaration attribute, but that belongs to a different DIE. */ - return (dwarf2_attribute_true_p (die, DW_AT_declaration, cu) - && ! dwarf2_attribute_true_p (die, DW_AT_specification, cu)); + return (dwarf2_attr (die, DW_AT_declaration, cu) + && ! dwarf2_attr (die, DW_AT_specification, cu)); } /* Return the die giving the specification for DIE, if there is |