From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 11 Feb 2016 08:11:52 +0000 (+0000)
Subject: 2016-02-11  Richard Biener  <rguenther@suse.de>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45dc511c816a2b00ca3c2b8666eff2e80a82dc91;p=thirdparty%2Fgcc.git

2016-02-11  Richard Biener  <rguenther@suse.de>

	PR rtl-optimization/69291
	* ifcvt.c (noce_try_store_flag_constants): Do not allow
	subexpressions affected by changing the result.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233316 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b4495d868c2f..6037782465c1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-11  Richard Biener  <rguenther@suse.de>
+
+	PR rtl-optimization/69291
+	* ifcvt.c (noce_try_store_flag_constants): Do not allow
+	subexpressions affected by changing the result.
+
 2016-02-10  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR target/69148
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index a50e33dc66cc..205590938a5e 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -1274,7 +1274,10 @@ noce_try_store_flag_constants (struct noce_if_info *if_info)
       && CONST_INT_P (XEXP (a, 1))
       && CONST_INT_P (XEXP (b, 1))
       && rtx_equal_p (XEXP (a, 0), XEXP (b, 0))
-      && noce_operand_ok (XEXP (a, 0))
+      /* Allow expressions that are not using the result or plain
+         registers where we handle overlap below.  */
+      && (REG_P (XEXP (a, 0))
+	  || ! reg_overlap_mentioned_p (if_info->x, XEXP (a, 0)))
       && if_info->branch_cost >= 2)
     {
       common = XEXP (a, 0);