[Bug default/27212] ./dwz: xxx: Invalid DW_AT_decl_file file number 20

[jakub at redhat dot com]

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

--- Comment #4 from Jakub Jelinek <jakub at redhat dot com> ---
So, I think part of the fix should be:
--- dwz.c.jj    2021-01-18 10:18:21.288726894 +0100
+++ dwz.c       2021-01-20 20:14:35.361320394 +0100
@@ -10456,7 +10456,9 @@ build_abbrevs_for_die (htab_t h, dw_cu_r
                    case DW_FORM_data4: value = read_32 (ptr); break;
                    case DW_FORM_data8: value = read_64 (ptr); break;
                    case DW_FORM_udata: value = read_uleb128 (ptr); break;
-                   case DW_FORM_implicit_const: break;
+                   case DW_FORM_implicit_const:
+                     value = reft->values[i];
+                     break;
                    default:
                      error (0, 0, "Unhandled %s for %s",
                             get_DW_FORM_str (form),
@@ -10465,10 +10467,12 @@ build_abbrevs_for_die (htab_t h, dw_cu_r
                    }
                  /* Note that the value is only used for calculating the
                     DIE size and possibly change form. Doesn't change the
-                    implicit_const from or value.  */
+                    implicit_const form or value, but line_htab_lookup
+                    needs to be called anyway, so that it records the used
+                    file.  */
+                 value = line_htab_lookup (refcu, value);
                  if (form != DW_FORM_implicit_const)
                    {
-                     value = line_htab_lookup (refcu, value);
                      if (value <= 0xff)
                        {
                          form = DW_FORM_data1;
But that doesn't really help to fix this completely.
The problem is I think that write_abbrev is always called before write_info,
and the remapping of the DW_AT_decl_file/DW_AT_call_file DW_FORM_implicit_const
is done only in write_die which is called either recursively or from
write_info/write_types.

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