summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/ifcvt.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b746a4f9263..a00388cafe6 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 205590938a5..4949965c9dc 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);