[Bug default/24468] dwz -m generates partial unit without import

["vries at gcc dot gnu.org" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=24468

--- Comment #2 from Tom de Vries <vries at gcc dot gnu.org> ---
(In reply to Tom de Vries from comment #1)
> So, what happens is this: the partial unit at 2b5 in the multifile contains
> as first die:
> ...
>  <1><2be>: Abbrev Number: 5 (DW_TAG_const_type)
>     <2bf>   DW_AT_type        : <0x4c>
> ...
> which refers to:
> ...
>  <1><4c>: Abbrev Number: 18 (DW_TAG_typedef)
>     <4d>   DW_AT_name        : (indirect string, offset: 0x54c): size_t
>     <51>   DW_AT_decl_file   : 1
>     <52>   DW_AT_decl_line   : 216
>     <53>   DW_AT_type        : <0x344>
> ...
> in another partial unit in the multifile.
> 
> When matching dies in the input file against the dies in the multifile
> during finalize_multifile, we compare 2be to 394:
> ...
>  <1><389>: Abbrev Number: 24 (DW_TAG_typedef)
>     <38a>   DW_AT_name        : (indirect string, offset: 0x226): size_t
>     <38e>   DW_AT_decl_file   : 2
>     <38f>   DW_AT_decl_line   : 216
>     <390>   DW_AT_type        : <0x14>
>  <1><394>: Abbrev Number: 7 (DW_TAG_const_type)
>     <395>   DW_AT_type        : <0x389>
> ...
> which then fails because of a mismatch in DW_FORM (DW_FORM_ref_addr vs
> DW_FORM_ref_udata).
> 

which is fixed by:
...
diff --git a/dwz.c b/dwz.c
index 8ea7c4d..93532b9 100644
--- a/dwz.c
+++ b/dwz.c
@@ -3161,7 +3161,7 @@ die_eq_1 (dw_cu_ref cu1, dw_cu_ref cu2,
       switch (form1)
        {
        case DW_FORM_ref_addr:
-         if (likely (!op_multifile && !rd_multifile))
+         if (likely (!op_multifile && !rd_multifile && !fi_multifile))
            {
              if (form1 != form2)
                FAIL;
@@ -3176,7 +3176,7 @@ die_eq_1 (dw_cu_ref cu1, dw_cu_ref cu2,
          switch (form2)
            {
            case DW_FORM_ref_addr:
-             if (likely (!op_multifile && !rd_multifile))
+             if (likely (!op_multifile && !rd_multifile && !fi_multifile))
                FAIL;
              break;
            case DW_FORM_ref_udata:
...

-- 
You are receiving this mail because:
You are on the CC list for the bug.