From: Uros Bizjak <uros@gcc.gnu.org>
Date: Thu, 7 Jan 2010 13:02:34 +0000 (+0100)
Subject: re PR rtl-optimization/42511 (bootstrap error in stage3 on alpha-linux-gnu)
X-Git-Tag: releases/gcc-4.5.0~1359
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b9ed9aae8ab67aff8f4335ba39693818007383c;p=thirdparty%2Fgcc.git

re PR rtl-optimization/42511 (bootstrap error in stage3 on alpha-linux-gnu)

	PR target/42511
	* ifcvt.c (dead_or_predicable): Also remove REG_EQUAL note when
	note itself is not function_invariant_p.

From-SVN: r155691
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5904c01873dc..1e072f378285 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-07  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR target/42511
+	* ifcvt.c (dead_or_predicable): Also remove REG_EQUAL note when
+	note itself is not function_invariant_p.
+
 2009-01-07  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* gcse.c (execute_rtl_cprop, execute_rtl_pre, execute_rtl_hoist):
@@ -84,7 +90,7 @@
 	and adjust call to legitimize_pic_address.
 	(sparc_output_mi_thunk): Likewise.
 
-2010-01-05  Paolo Bonzini  <bonzinI@gnu.rg>
+2010-01-05  Paolo Bonzini  <bonzini@gnu.rg>
 	    H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/42542
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 00ac61ec4786..c30b80493327 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -4087,7 +4087,8 @@ dead_or_predicable (basic_block test_bb, basic_block merge_bb,
 	  if (! note)
 	    continue;
 	  set = single_set (insn);
-	  if (!set || !function_invariant_p (SET_SRC (set)))
+	  if (!set || !function_invariant_p (SET_SRC (set))
+	      || !function_invariant_p (XEXP (note, 0)))
 	    remove_note (insn, note);
 	} while (insn != end && (insn = NEXT_INSN (insn)));