[PATCH 2/3] [gdb/contrib] Fix UnicodeDecodeError in dwarf-to-dwarf-assembler.py

[Tom de Vries <tdevries@suse.de>]

When running dwarf-to-dwarf-assembler.py on outputs/gdb.rust/unicode/unicode,
I run into a UnicodeDecodeError for (using readelf -w):
...
 <4><9cf>: Abbrev Number: 10 (DW_TAG_variable)
    <9d3>   DW_AT_name        : (indirect string, offset: 0xab4): 𝕯
...
or more explicit using llvm-dwarfdump -v:
...
0x000009cf:         DW_TAG_variable [10]   (0x000009c2)
                      DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000ab4] \
                                                  = "\360\235\225\257")
...

Fix this by printing:
...
                        DW_TAG_variable {
			    ...
                            DW_AT_name "\xf0\x9d\x95\xaf" DW_FORM_strp
...

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33970
---
 gdb/contrib/dwarf-to-dwarf-assembler.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gdb/contrib/dwarf-to-dwarf-assembler.py b/gdb/contrib/dwarf-to-dwarf-assembler.py
index fa32bc4bbab..c1818f9fdb8 100755
--- a/gdb/contrib/dwarf-to-dwarf-assembler.py
+++ b/gdb/contrib/dwarf-to-dwarf-assembler.py
@@ -174,7 +174,14 @@ class DWARFAttribute:
             else:
                 return str(self.value)
         elif isinstance(self.value, bytes):
-            return self._format_str(self.value.decode("ascii"))
+            try:
+                return self._format_str(self.value.decode("ascii"))
+            except UnicodeDecodeError:
+                # Print the data as a string in "\x01\x02\x03\x04" format.
+                result = ""
+                for byte in self.value:
+                    result += f"\\x{byte:02x}"
+                return '"' + result + '"'
         elif isinstance(self.value, str):
             return self._format_str(self.value)
         elif isinstance(self.value, ListContainer):
-- 
2.51.0