From: Eugene Sharygin <eush@ispras.ru>
Date: Fri, 26 Apr 2019 15:48:43 +0000 (+0000)
Subject: gdbhooks.py: Fix UnicodeDecodeErrors when printing trees with corrupt codes.
X-Git-Tag: misc/cutover-git~5891
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=224d9de0e84026e7c19c51f05d2f4e8dedd291ed;p=thirdparty%2Fgcc.git

gdbhooks.py: Fix UnicodeDecodeErrors when printing trees with corrupt codes.

	* gdbhooks.py: Fix UnicodeDecodeErrors when printing trees with
	corrupt codes.

From-SVN: r270607
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3330d1c8905f..4434ba564832 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-26  Eugene Sharygin  <eush@ispras.ru>
+
+	* gdbhooks.py: Fix UnicodeDecodeErrors when printing trees with
+	corrupt codes.
+
 2019-04-26  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* tree.h (TYPE_VECTOR_SUBPARTS, SET_TYPE_VECTOR_SUBPARTS): Add
diff --git a/gcc/gdbhooks.py b/gcc/gdbhooks.py
index bbe7618e299a..7b1a7be0002d 100644
--- a/gcc/gdbhooks.py
+++ b/gcc/gdbhooks.py
@@ -229,7 +229,10 @@ class TreePrinter:
         val_code_name = val_tree_code_name[intptr(val_TREE_CODE)]
         #print(val_code_name.string())
 
-        result = '<%s 0x%x' % (val_code_name.string(), intptr(self.gdbval))
+        try:
+            result = '<%s 0x%x' % (val_code_name.string(), intptr(self.gdbval))
+        except:
+            return '<tree 0x%x>' % intptr(self.gdbval)
         if intptr(val_tclass) == tcc_declaration:
             tree_DECL_NAME = self.node.DECL_NAME()
             if tree_DECL_NAME.is_nonnull():