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

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

	PR rtl-optimization/69291
	* ifcvt.c (noce_try_store_flag_constants): Re-instantiate
	noce_operand_ok check.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b746a4f9263e..a00388cafe6b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-16  Richard Biener  <rguenther@suse.de>
+
+	PR rtl-optimization/69291
+	* ifcvt.c (noce_try_store_flag_constants): Re-instantiate
+	noce_operand_ok check.
+
 2016-02-16  Tom de Vries  <tom@codesourcery.com>
 
 	PR lto/67709
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 205590938a5e..4949965c9dc7 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -1277,7 +1277,8 @@ noce_try_store_flag_constants (struct noce_if_info *if_info)
       /* 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)))
+	  || (noce_operand_ok (XEXP (a, 0))
+	      && ! reg_overlap_mentioned_p (if_info->x, XEXP (a, 0))))
       && if_info->branch_cost >= 2)
     {
       common = XEXP (a, 0);