From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 5 Sep 2016 08:49:41 +0000 (+0200)
Subject: re PR rtl-optimization/77425 (Pointer test follows dereference in sched-int.h)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=61f46d0e6dd5688e2a1e8cf1d45f92cf7182bac7;p=gcc.git

re PR rtl-optimization/77425 (Pointer test follows dereference in sched-int.h)

	PR rtl-optimization/77425
	* ipa-devirt.c (get_odr_type): Set val->id unconditionally.

From-SVN: r239986
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a66766c7a3e..c65af836910 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/77425
+	* ipa-devirt.c (get_odr_type): Set val->id unconditionally.
+
 2016-09-03  Kirill Yukhin  <kirill.yukhin@intel.com>
 
 	* ubsan.c (ubsan_use_new_style_p): Fix check for empty string.
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 2cf018bdf39..98d35006f2b 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -2136,8 +2136,7 @@ get_odr_type (tree type, bool insert)
       /* Be sure we did not recorded any derived types; these may need
 	 renumbering too.  */
       gcc_assert (val->derived_types.length() == 0);
-      if (odr_types_ptr)
-	val->id = odr_types.length ();
+      val->id = odr_types.length ();
       vec_safe_push (odr_types_ptr, val);
     }
   return val;