From: Jan Hubicka <hubicka@ucw.cz>
Date: Mon, 19 Nov 2018 23:27:10 +0000 (+0100)
Subject: re PR ipa/87957 (ICE tree check: expected tree that contains ‘decl minimal’ structure... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=502e897d1afa16df33326d255120d7cd15df9363;p=gcc.git

re PR ipa/87957 (ICE tree check: expected tree that contains ‘decl minimal’ structure, have ‘identifier_node’ in warn_odr, at ipa-devirt.c:1051 since r265519)


	PR lto/87957
	* ipa-devirt.c (free_enum_values): Do not ICE on ODR vilations.

From-SVN: r266289
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a1f956cb0d..6669b20b1f4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-19  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR lto/87957
+	* ipa-devirt.c (free_enum_values): Do not ICE on ODR vilations.
+
 2018-11-19  Sandra Loosemore  <sandra@codesourcery.com>
 
 	PR driver/50250
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index db8d34c4027..ca583c49309 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -2268,12 +2268,14 @@ free_enum_values ()
   enum_values_freed = true;
   unsigned int i;
   for (i = 0; i < odr_types.length (); i++)
-    if (odr_types[i] && TREE_CODE (odr_types[i]->type) == ENUMERAL_TYPE)
+    if (odr_types[i])
       {
-	TYPE_VALUES (odr_types[i]->type) = NULL;
+	if (TREE_CODE (odr_types[i]->type) == ENUMERAL_TYPE)
+	  TYPE_VALUES (odr_types[i]->type) = NULL;
 	if (odr_types[i]->types)
           for (unsigned int j = 0; j < odr_types[i]->types->length (); j++)
-	    TYPE_VALUES ((*odr_types[i]->types)[j]) = NULL;
+	    if (TREE_CODE ((*odr_types[i]->types)[j]) == ENUMERAL_TYPE)
+	      TYPE_VALUES ((*odr_types[i]->types)[j]) = NULL;
       }
   enum_values_freed = true;
 }