backport: re PR rtl-optimization/44691 (ICE: RTL check: expected code 'reg', have 'plus' in rhs_regno, at rtl.h:1050)

Backport from mainline:
        PR rtl-optimization/44691
        * sel-sched.c (count_occurrences_1): Also punt when SUBREG_REG
        is not a register.

        * gfortran.dg/pr44691.f: New test.

From-SVN: r163516
This commit is contained in:
Andrey Belevantsev 2010-08-24 13:11:48 +04:00 committed by Andrey Belevantsev
parent 9b6b8023df
commit a5034e25cd
4 changed files with 60 additions and 1 deletions

View File

@ -1,3 +1,12 @@
2010-08-24 Andrey Belevantsev <abel@ispras.ru>
Backport from mainline:
2010-08-19 Andrey Belevantsev <abel@ispras.ru>
PR rtl-optimization/44691
* sel-sched.c (count_occurrences_1): Also punt when SUBREG_REG
is not a register.
2010-08-24 Andrey Belevantsev <abel@ispras.ru>
Backport from mainline:

View File

@ -835,7 +835,8 @@ count_occurrences_1 (rtx *cur_rtx, void *arg)
if (GET_CODE (*cur_rtx) == SUBREG
&& REG_P (p->x)
&& REGNO (SUBREG_REG (*cur_rtx)) == REGNO (p->x))
&& (!REG_P (SUBREG_REG (*cur_rtx))
|| REGNO (SUBREG_REG (*cur_rtx)) == REGNO (p->x)))
{
/* ??? Do not support substituting regs inside subregs. In that case,
simplify_subreg will be called by validate_replace_rtx, and

View File

@ -1,3 +1,11 @@
2010-08-24 Andrey Belevantsev <abel@ispras.ru>
Backport from mainline:
2010-08-19 Andrey Belevantsev <abel@ispras.ru>
PR rtl-optimization/44691
* gfortran.dg/pr44691.f: New test.
2010-08-24 Andrey Belevantsev <abel@ispras.ru>
Backport from mainline:

View File

@ -0,0 +1,41 @@
C PR rtl-optimization/44691
C { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } }
C { dg-options "-O2 -fselective-scheduling2" }
SUBROUTINE ORIEN(IW,NATOT,NTOTORB,NATORB,P,T)
IMPLICIT DOUBLE PRECISION(A-H,O-Z)
DIMENSION NATORB(NATOT),P(NTOTORB*(NTOTORB+1)/2)
DIMENSION T(NTOTORB,NTOTORB)
DO 9000 IATOM=1,NATOT
ILAST = NTOTORB
IF (IATOM.NE.NATOT) ILAST=NATORB(IATOM+1)-1
DO 8000 IAOI=NATORB(IATOM),ILAST
DO 7000 IAOJ = IAOI+1,ILAST
R2 = 0.0D+00
R3 = 0.0D+00
DO 6000 INOTA=1,NATOT
DO 5000 IK=NATORB(INOTA),NTOTORB
IMAI=MAX(IK,IAOI)
IMII=MIN(IK,IAOI)
IMAJ=MAX(IK,IAOJ)
IMIJ=MIN(IK,IAOJ)
IKI=(IMAI*(IMAI-1))/2 + IMII
IKJ=(IMAJ*(IMAJ-1))/2 + IMIJ
PIKI=P(IKI)
PIKJ=P(IKJ)
R2 = R2 + (PIKI**4)-6*(PIKI*PIKI*PIKJ*PIKJ)+(PIKJ)
5000 CONTINUE
6000 CONTINUE
R2 = (R2/4.0D+00)
Q = SQRT(R2*R2 + R3*R3)
IF (Q.LT.1.0D-08) GO TO 7000
A = COS(THETA)
B = -SIN(THETA)
CALL ROT1INT(NTOTORB,IAOI,IAOJ,A,B,P)
7000 CONTINUE
8000 CONTINUE
9000 CONTINUE
RETURN
END