aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorVladimir Makarov <vmakarov@redhat.com>2014-05-23 01:52:01 +0000
committerVladimir Makarov <vmakarov@gcc.gnu.org>2014-05-23 01:52:01 +0000
commitb17ec42d4c8cd1779306b81e0d090dc9f8f69c2a (patch)
tree9000fcbfabfb89ef31f27a797a7cca7449821d09 /gcc
parentea9364db15e72bd9741bce7eab6bfcc1f296810f (diff)
downloadgcc-b17ec42d4c8cd1779306b81e0d090dc9f8f69c2a.zip
gcc-b17ec42d4c8cd1779306b81e0d090dc9f8f69c2a.tar.gz
gcc-b17ec42d4c8cd1779306b81e0d090dc9f8f69c2a.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/lra-eliminations.c10
2 files changed, 16 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5676c03..8acc942b 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 abdf697..2787820 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));