[PATCH] debugedit: Handle DWARF5 DW_UT_type (Unit type 2) in ET_EXE/DYN

[Mark Wielaard]

Handle DW_UT_type as if it is a DW_UT_compile unit by skipping the
type id and offset in the header. Which are the only differences with
DW_UT_compile. And the id and offset don't need to be rewritten. This
doesn't handle debug types in objects or partial linked (ET_REL) files
that contain COMDAT sections (because debugedit doesn't handle more
than one debug_info section). Add a testcase for foobarbaz.exe.

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

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 tests/debugedit.at | 35 +++++++++++++++++++++++++++++++++--
 tools/debugedit.c  | 16 ++++++++++++----
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/tests/debugedit.at b/tests/debugedit.at
index 4413704acc0b..f67747a858a7 100644
--- a/tests/debugedit.at
+++ b/tests/debugedit.at
@@ -439,9 +439,9 @@ AT_CLEANUP
 
 # ===
 # Make sure -fdebug-types-section has updated strings in executable.
-# Currently only works with DWARF4
+# DWARF4
 # ===
-AT_SETUP([debugedit .debug_types exe])
+AT_SETUP([debugedit .debug_types exe DWARF4])
 AT_KEYWORDS([debugtypes] [debugedit])
 DEBUGEDIT_SETUP([-fdebug-types-section -gdwarf-4])
 AT_SKIP_IF([! $READELF -S ./foobarbaz.exe | grep -F -q '.debug_types'])
@@ -467,6 +467,37 @@ $READELF --debug-dump=info ./foobarbaz.exe \
 
 AT_CLEANUP
 
+# ===
+# Make sure -fdebug-types-section has updated strings in executable.
+# DWARF5
+# ===
+AT_SETUP([debugedit .debug_types exe DWARF5])
+AT_KEYWORDS([debugtypes] [debugedit])
+DEBUGEDIT_SETUP([-fdebug-types-section -gdwarf-5])
+AT_SKIP_IF([test "$GDWARF_5_FLAG" = "no"])
+AT_SKIP_IF([! $READELF --debug-dump=info ./foobarbaz.exe | grep -F -q 'DW_TAG_type_unit'])
+
+AT_DATA([expout],
+[st1
+stb
+stf
+stringp1
+stringp_bar
+stringp_baz
+stringp_foo
+stz
+])
+
+AT_CHECK([[debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe]])
+AT_CHECK([[
+$READELF --debug-dump=info ./foobarbaz.exe \
+        | awk '/Abbrev Number:.*DW_TAG_type_unit/{p=1}{if(p)print}/^$/{p=0}' \
+        | sed -n 's/^.*> *DW_AT_name *:.* \(stringp[^ ]*\|st.\)$/\1/p' \
+        | sort
+]],[0],[expout])
+
+AT_CLEANUP
+
 # foo.o and bar.o are build with relative paths and so will use the
 # comp_dir (from .debug_info). But bar.o is build from sources with
 # an absolute path, so the .debug_line Directory Table should contain
diff --git a/tools/debugedit.c b/tools/debugedit.c
index 6bdb3f7f1d63..71620095c4d0 100644
--- a/tools/debugedit.c
+++ b/tools/debugedit.c
@@ -2628,10 +2628,13 @@ edit_info (DSO *dso, int phase, struct debug_section *sec)
 
       int cu_ptr_size = 0;
 
+      uint8_t unit_type = DW_UT_compile;
       if (cu_version >= 5)
 	{
-	  uint8_t unit_type = read_8 (ptr);
-	  if (unit_type != DW_UT_compile && unit_type != DW_UT_partial)
+	  unit_type = read_8 (ptr);
+	  if (unit_type != DW_UT_compile
+	      && unit_type != DW_UT_partial
+	      && unit_type != DW_UT_type)
 	    {
 	      error (0, 0, "%s: Unit type %u unhandled", dso->filename,
 		     unit_type);
@@ -2641,7 +2644,12 @@ edit_info (DSO *dso, int phase, struct debug_section *sec)
 	  cu_ptr_size = read_8 (ptr);
 	}
 
-      unsigned char *header_end = (cu_start + 23 + (cu_version < 5 ? 0 : 1));
+      unsigned char *header_end = (cu_start + 23
+				   + (cu_version < 5
+				      ? 0
+				      : (unit_type != DW_UT_type
+					 ? 1 /* unit */
+					 : 1 + 8 + 4))); /* unit, id, off */
       if (header_end > endsec)
 	{
 	  error (0, 0, "%s: %s CU header too small", dso->filename, sec->name);
@@ -2671,7 +2679,7 @@ edit_info (DSO *dso, int phase, struct debug_section *sec)
 
       cu->ptr_size = cu_ptr_size;
 
-      if (sec != &debug_sections[DEBUG_INFO])
+      if (sec != &debug_sections[DEBUG_INFO] || unit_type == DW_UT_type)
 	ptr += 12; /* Skip type_signature and type_offset.  */
 
       abbrev = read_abbrev (dso,
-- 
2.46.1