re PR sanitizer/58420 (internal compiler error: in ubsan_type_descriptor, at ubsan...

	PR sanitizer/58420
	* ubsan.c (ubsan_type_descriptor): Handle IDENTIFIER_NODEs
	when determining the type name.

From-SVN: r202887

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b003a51669ea95165c25d31fd6adb3b44da7b26..e6f2b9ea8fd77d5861cf5ba3bce2a68f4925e48d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-25  Marek Polacek  <polacek@redhat.com>
+
+       PR sanitizer/58420
+       * ubsan.c (ubsan_type_descriptor): Handle IDENTIFIER_NODEs
+       when determining the type name.
+
 2013-09-24  Oleg Endo  <olegendo@gcc.gnu.org>
 
        * config/sh/sh.md: Fix formatting.

diff --git a/gcc/ubsan.c b/gcc/ubsan.c
index 6c6fea80afd3e0fb7f036a7b12e467c337acea45..9dc19c9d29add73ab8d44e5ff5fa6539fefbddc8 100644 (file)
--- a/gcc/ubsan.c
+++ b/gcc/ubsan.c
@@ -259,11 +259,18 @@ ubsan_type_descriptor (tree type)
   unsigned short tkind, tinfo;
 
   /* At least for INTEGER_TYPE/REAL_TYPE/COMPLEX_TYPE, this should work.
-     ??? For e.g. type_unsigned_for (type), the TYPE_NAME would be NULL.  */
+     For e.g. type_unsigned_for (type) or bit-fields, the TYPE_NAME
+     would be NULL.  */
   if (TYPE_NAME (type) != NULL)
-    tname = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type)));
+    {
+      if (TREE_CODE (TYPE_NAME (type)) == IDENTIFIER_NODE)
+       tname = IDENTIFIER_POINTER (TYPE_NAME (type));
+      else
+       tname = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type)));
+    }
   else
     tname = "<unknown>";
+
   if (TREE_CODE (type) == INTEGER_TYPE)
     {
       /* For INTEGER_TYPE, this is 0x0000.  */