From: Vladimir Makarov <vmakarov@redhat.com>
Date: Fri, 23 May 2014 01:52:01 +0000 (+0000)
Subject: re PR rtl-optimization/61215 (ICE in gen_add2_insn, at optabs.c:4718 when building... 
X-Git-Tag: releases/gcc-5.1.0~7349
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b17ec42d4c8cd1779306b81e0d090dc9f8f69c2a;p=thirdparty%2Fgcc.git

re PR rtl-optimization/61215 (ICE in gen_add2_insn, at optabs.c:4718 when building wine-1.7.19)

2014-05-22  Vladimir Makarov  <vmakarov@redhat.com>

	PR rtl-optimization/61215
	* lra-elelimination.c (lra_eliminate_regs_1): Don't use
	simplify_gen_subreg until final substitution.

From-SVN: r210838
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5676c0313df8..8acc942bfbe9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-22  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR rtl-optimization/61215
+	* lra-elelimination.c (lra_eliminate_regs_1): Don't use
+	simplify_gen_subreg until final substitution.
+
 2014-05-23  Alan Modra  <amodra@gmail.com>
 
 	PR target/61231
diff --git a/gcc/lra-eliminations.c b/gcc/lra-eliminations.c
index abdf69733103..27878203555d 100644
--- a/gcc/lra-eliminations.c
+++ b/gcc/lra-eliminations.c
@@ -565,6 +565,16 @@ lra_eliminate_regs_1 (rtx insn, rtx x, enum machine_mode mem_mode,
 	      alter_subreg (&x, false);
 	      return x;
 	    }
+	  else if (! subst_p)
+	    {
+	      /* LRA can transform subregs itself.  So don't call
+		 simplify_gen_subreg until LRA transformations are
+		 finished.  Function simplify_gen_subreg can do
+		 non-trivial transformations (like truncation) which
+		 might make LRA work to fail.  */
+	      SUBREG_REG (x) = new_rtx;
+	      return x;
+	    }
 	  else
 	    return simplify_gen_subreg (GET_MODE (x), new_rtx,
 					GET_MODE (new_rtx), SUBREG_BYTE (x));