From d70b0f1f2212a900b8547b288a7c3d2ae89ac267 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Wed, 25 Sep 2013 09:04:20 +0000 Subject: [PATCH] re PR sanitizer/58420 (internal compiler error: in ubsan_type_descriptor, at ubsan.c:280) PR sanitizer/58420 * ubsan.c (ubsan_type_descriptor): Handle IDENTIFIER_NODEs when determining the type name. From-SVN: r202887 --- gcc/ChangeLog | 6 ++++++ gcc/ubsan.c | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4b003a51669..e6f2b9ea8fd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-09-25 Marek Polacek + + PR sanitizer/58420 + * ubsan.c (ubsan_type_descriptor): Handle IDENTIFIER_NODEs + when determining the type name. + 2013-09-24 Oleg Endo * config/sh/sh.md: Fix formatting. diff --git a/gcc/ubsan.c b/gcc/ubsan.c index 6c6fea80afd..9dc19c9d29a 100644 --- 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 = ""; + if (TREE_CODE (type) == INTEGER_TYPE) { /* For INTEGER_TYPE, this is 0x0000. */ -- 2.30.2