aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@libertysurf.fr>2003-12-07 13:51:58 +0100
committerEric Botcazou <ebotcazou@gcc.gnu.org>2003-12-07 12:51:58 +0000
commit5c6ef9bee008cc943f4387f405e8211cdd58c9e0 (patch)
treeed97c4ce5a02dd2a6ac017a82196f55590338697 /gcc
parent57616df1c3d047ac14ac29b3b0b25c2ea549550d (diff)
downloadgcc-5c6ef9bee008cc943f4387f405e8211cdd58c9e0.zip
gcc-5c6ef9bee008cc943f4387f405e8211cdd58c9e0.tar.gz
gcc-5c6ef9bee008cc943f4387f405e8211cdd58c9e0.tar.bz2
re PR rtl-optimization/13060 ([g77] ICE in fixup_var_refs_1, at function.c:1947 on correct code with "-O2 -fno-force-mem")
PR optimization/13060 * function.c (fixup_var_refs_1) [SUBREG]: Recognize even if a replacement already exists. Fix again the whole insn if that fails. From-SVN: r74386
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/function.c16
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/g77.f-torture/compile/13060.f13
4 files changed, 39 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7343b32..c37ec9b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-07 Eric Botcazou <ebotcazou@libertysurf.fr>
+
+ PR optimization/13060
+ * function.c (fixup_var_refs_1) [SUBREG]: Recognize even if a
+ replacement already exists. Fix again the whole insn if that fails.
+
2003-12-06 Andrew Pinski <pinskia@physics.uc.edu>
* config/rs6000/rs6000.c (macho_branch_islands): Use
diff --git a/gcc/function.c b/gcc/function.c
index 2a8f30b..ed73315 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -2092,7 +2092,23 @@ fixup_var_refs_1 (rtx var, enum machine_mode promoted_mode, rtx *loc, rtx insn,
replacement = find_fixup_replacement (replacements, x);
if (replacement->new)
{
+ enum machine_mode mode = GET_MODE (x);
*loc = replacement->new;
+
+ /* Careful! We may have just replaced a SUBREG by a MEM, which
+ means that the insn may have become invalid again. We can't
+ in this case make a new replacement since we already have one
+ and we must deal with MATCH_DUPs. */
+ if (GET_CODE (replacement->new) == MEM)
+ {
+ INSN_CODE (insn) = -1;
+ if (recog_memoized (insn) >= 0)
+ return;
+
+ fixup_var_refs_1 (replacement->new, mode, &PATTERN (insn),
+ insn, replacements, no_share);
+ }
+
return;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d65ed73..3e1be98 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-07 Eric Botcazou <ebotcazou@libertysurf.fr>
+
+ * g77.f-torture/compile/13060.f: New test.
+
2003-12-06 Mark Mitchell <mark@codesourcery.com>
PR c++/13323
diff --git a/gcc/testsuite/g77.f-torture/compile/13060.f b/gcc/testsuite/g77.f-torture/compile/13060.f
new file mode 100644
index 0000000..200117b
--- /dev/null
+++ b/gcc/testsuite/g77.f-torture/compile/13060.f
@@ -0,0 +1,13 @@
+ subroutine geo2()
+ implicit none
+
+ integer ms,n,ne(2)
+
+ ne(1) = 1
+ ne(2) = 2
+ ms = 1
+
+ call call_me(ne(1)*ne(1))
+
+ n = ne(ms)
+ end