From 5c6ef9bee008cc943f4387f405e8211cdd58c9e0 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sun, 7 Dec 2003 13:51:58 +0100 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/function.c | 16 ++++++++++++++++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g77.f-torture/compile/13060.f | 13 +++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 gcc/testsuite/g77.f-torture/compile/13060.f 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 + + 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 * 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 + + * g77.f-torture/compile/13060.f: New test. + 2003-12-06 Mark Mitchell 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 -- 2.7.4