From: Martin Jambor <mjambor@suse.cz>
Date: Thu, 17 May 2018 12:18:06 +0000 (+0200)
Subject: Check is_single_const in intersect_with_plats
X-Git-Tag: releases/gcc-6.5.0~316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e9604c154edf30ba288105626be397975f84073;p=thirdparty%2Fgcc.git

Check is_single_const in intersect_with_plats

2018-05-17  Martin Jambor  <mjambor@suse.cz>

	Backport from mainline
	2018-05-11  Martin Jambor  <mjambor@suse.cz>

	PR ipa/85655
	* ipa-cp.c (intersect_with_plats): Check that the lattice contains
	single const.

From-SVN: r260319
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2009dc041d26..03be2a8c57eb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2018-05-17  Martin Jambor  <mjambor@suse.cz>
+
+	Backport from mainline
+	2018-05-11  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/85655
+	* ipa-cp.c (intersect_with_plats): Check that the lattice contains
+	single const.
+
 2018-05-11  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	PR target/83687
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index caa346f7016b..b09167fc99f2 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -3703,7 +3703,9 @@ intersect_with_plats (struct ipcp_param_lattices *plats,
 	  if (aglat->offset - offset == item->offset)
 	    {
 	      gcc_checking_assert (item->value);
-	      if (values_equal_for_ipcp_p (item->value, aglat->values->value))
+	      if (aglat->is_single_const ()
+		  && values_equal_for_ipcp_p (item->value,
+					      aglat->values->value))
 		found = true;
 	      break;
 	    }