[commit] (read_cutu_die_from_dwo): Fix assertion

[commit] (read_cutu_die_from_dwo): Fix assertion

[Doug Evans]

Hi.

Thinko on my part, checked in as obvious.

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.

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.

Re: [commit] (read_cutu_die_from_dwo): Fix assertion

[Doug Evans]

Doug Evans writes:
 > Hi.
 > 
 > Thinko on my part, checked in as obvious.
 > 
 > 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.
 > 
 > 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.

Bleah.  Plus the correspondent function comment update.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 103219c..d156504 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -4946,8 +4946,8 @@ init_cu_die_reader (struct die_reader_specs *reader,
    from it to the DIE in the DWO.  If NULL we are skipping the stub.
    STUB_COMP_DIR is similar to STUB_COMP_UNIT_DIE: When reading a TU directly
    from the DWO file, bypassing the stub, it contains the DW_AT_comp_dir
-   attribute of the referencing CU.  Exactly one of STUB_COMP_UNIT_DIE and
-   STUB_COMP_DIR must be non-NULL.
+   attribute of the referencing CU.  At most one of STUB_COMP_UNIT_DIE and
+   STUB_COMP_DIR may be non-NULL.
    *RESULT_READER,*RESULT_INFO_PTR,*RESULT_COMP_UNIT_DIE,*RESULT_HAS_CHILDREN
    are filled in with the info of the DIE from the DWO file.
    ABBREV_TABLE_PROVIDED is non-zero if the caller of init_cutu_and_read_dies