From: Chung-Lin Tang <cltang@codesourcery.com>
Date: Sat, 10 Mar 2012 14:57:30 +0000 (+0000)
Subject: re PR rtl-optimization/52528 (combine bug (powerpc testcase))
X-Git-Tag: misc/gccgo-go1_1_2~4088
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30823ba60cafe3c1236e5ee89621f17e6dbae181;p=thirdparty%2Fgcc.git

re PR rtl-optimization/52528 (combine bug (powerpc testcase))

2012-03-10  Chung-Lin Tang  <cltang@codesourcery.com>

	PR rtl-optimization/52528
	* combine.c (can_combine_p): Add setting of subst_low_luid
	before call to expand_field_assignment().

From-SVN: r185175
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 06d562bff023..b5e3b36ce76a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-10  Chung-Lin Tang  <cltang@codesourcery.com>
+
+	PR rtl-optimization/52528
+	* combine.c (can_combine_p): Add setting of subst_low_luid
+	before call to expand_field_assignment().
+
 2012-03-09  Sandra Loosemore  <sandra@codesourcery.com>
 
 	* doc/invoke.texi: Use correct names/markup for "GCC", "GDB", "ld",
diff --git a/gcc/combine.c b/gcc/combine.c
index d06de04041e8..ab825e4ee984 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -1822,6 +1822,10 @@ can_combine_p (rtx insn, rtx i3, rtx pred ATTRIBUTE_UNUSED,
   if (set == 0)
     return 0;
 
+  /* The simplification in expand_field_assignment may call back to
+     get_last_value, so set safe guard here.  */
+  subst_low_luid = DF_INSN_LUID (insn);
+
   set = expand_field_assignment (set);
   src = SET_SRC (set), dest = SET_DEST (set);