diff options
| author | Doug Evans <dje@google.com> | 2014-04-03 12:07:25 -0700 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2014-04-03 12:07:25 -0700 |
| commit | b0aeadb398e0cea7a7f0ff3e6fb20c9aea98453c (patch) | |
| tree | 8bc94b66978294e6ae335670c412fbdd53bae947 | |
| parent | b69c87280595b7ce4e956cb2a62278412f0722f7 (diff) | |
| download | gdb-b0aeadb398e0cea7a7f0ff3e6fb20c9aea98453c.zip gdb-b0aeadb398e0cea7a7f0ff3e6fb20c9aea98453c.tar.gz gdb-b0aeadb398e0cea7a7f0ff3e6fb20c9aea98453c.tar.bz2 | |
* dwarf2read.c (read_cutu_die_from_dwo): Fix assertion, at most one
of stub_comp_unit_die, stub_comp_dir is non-NULL.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/dwarf2read.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b953940..ea3d976 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-04-03 Doug Evans <dje@google.com> + + * dwarf2read.c (read_cutu_die_from_dwo): Fix assertion, at most one + of stub_comp_unit_die, stub_comp_dir is non-NULL. + 2014-04-02 Alan Modra <amodra@gmail.com> * symfile-mem.c (symbol_file_add_from_memory): Add size parameter. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 3e77cf8..103219c 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -4977,8 +4977,8 @@ read_cutu_die_from_dwo (struct dwarf2_per_cu_data *this_cu, struct attribute *attr; struct die_info *comp_unit_die; - /* Exactly one of these must be provided. */ - gdb_assert ((stub_comp_unit_die != NULL) + (stub_comp_dir != NULL) == 1); + /* At most one of these may be provided. */ + gdb_assert ((stub_comp_unit_die != NULL) + (stub_comp_dir != NULL) <= 1); /* These attributes aren't processed until later: DW_AT_stmt_list, DW_AT_low_pc, DW_AT_high_pc, DW_AT_ranges. |