This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] Fix try_combine leaving RTL modified after undo_all (PR rtl-optimization/38722)
- From: Jakub Jelinek <jakub at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Tue, 6 Jan 2009 16:12:22 +0100
- Subject: [PATCH] Fix try_combine leaving RTL modified after undo_all (PR rtl-optimization/38722)
- Reply-to: Jakub Jelinek <jakub at redhat dot com>
Hi!
try_combine around line 2900 sets PATTERN (i3) and rearranges notes
unconditionally, far before deciding whether to combine or not.
On the attached testcase this leads to insn with incorrect INSN_CODE,
but I guess it can have various other nasty effects.
Fixed similarly to how swap_i2i3 is handled, by setting a flag and
doing the change for real only when we decide to commit (i.e. after
last undo_all () point).
Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?
2009-01-06 Jakub Jelinek <jakub@redhat.com>
PR rtl-optimization/38722
* combine.c (try_combine): Don't modify PATTERN (i3) and notes
too early, only set a flag and modify after last possible
undo_all point.
* gfortran.dg/pr38722.f90: New test.
--- gcc/combine.c.jj 2008-12-03 16:32:17.000000000 +0100
+++ gcc/combine.c 2009-01-06 13:06:57.000000000 +0100
@@ -1,6 +1,6 @@
/* Optimize by combining instructions for GNU compiler.
Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
Free Software Foundation, Inc.
This file is part of GCC.
@@ -2208,6 +2208,7 @@ try_combine (rtx i3, rtx i2, rtx i1, int
/* Notes that I1, I2 or I3 is a MULT operation. */
int have_mult = 0;
int swap_i2i3 = 0;
+ int changed_i3_dest = 0;
int maxreg;
rtx temp;
@@ -2895,14 +2896,7 @@ try_combine (rtx i3, rtx i2, rtx i1, int
insn_code_number = recog_for_combine (&newpat, i3, &new_i3_notes);
if (insn_code_number >= 0)
- {
- /* If we will be able to accept this, we have made a
- change to the destination of I3. This requires us to
- do a few adjustments. */
-
- PATTERN (i3) = newpat;
- adjust_for_new_dest (i3);
- }
+ changed_i3_dest = 1;
}
}
@@ -3375,6 +3369,16 @@ try_combine (rtx i3, rtx i2, rtx i1, int
return 0;
}
+ /* If we will be able to accept this, we have made a
+ change to the destination of I3. This requires us to
+ do a few adjustments. */
+
+ if (changed_i3_dest)
+ {
+ PATTERN (i3) = newpat;
+ adjust_for_new_dest (i3);
+ }
+
/* We now know that we can do this combination. Merge the insns and
update the status of registers and LOG_LINKS. */
--- gcc/testsuite/gfortran.dg/pr38722.f90.jj 2009-01-05 14:08:07.000000000 +0100
+++ gcc/testsuite/gfortran.dg/pr38722.f90 2009-01-05 14:06:56.000000000 +0100
@@ -0,0 +1,38 @@
+! PR rtl-optimization/38722
+! { dg-do compile }
+! { dg-options "-O1" }
+SUBROUTINE foo(x, n, ga, gc, vr)
+ TYPE pt
+ DOUBLE PRECISION, DIMENSION (:, :, :), POINTER :: cr
+ END TYPE pt
+ TYPE pu
+ TYPE(pt), POINTER :: pw
+ END TYPE pu
+ LOGICAL, INTENT(in) :: x, ga, gc
+ INTEGER :: i, n
+ LOGICAL :: dd, ep, fe
+ TYPE(pu) :: vr
+ TYPE(pu), DIMENSION(:), POINTER :: v
+ IF (.NOT. fe) THEN
+ IF (ga) THEN
+ CALL bar (dd, ep, gc)
+ END IF
+ IF (x .AND. .NOT. ga) THEN
+ IF (gc) THEN
+ DO i=1,n
+ CALL baz (v(i), x, gc)
+ v(i)%pw%cr = 1.0
+ END DO
+ DO i=1,n
+ IF (ep) THEN
+ IF (dd) THEN
+ IF (i==1) THEN
+ v(i)%pw%cr=v(i)%pw%cr + vr%pw%cr
+ ENDIF
+ END IF
+ END IF
+ END DO
+ END IF
+ ENDIF
+ END IF
+END SUBROUTINE foo
Jakub