From 443aa7d5764a1786880bf6d10f522f5e3cfe2795 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Fri, 29 Aug 2008 11:40:47 +0000 Subject: [PATCH] re PR middle-end/37236 (ICE: in mark_operand_necessary, at tree-ssa-dce.c:242) 2008-08-29 Richard Guenther PR middle-end/37236 * tree-ssa-structalias.c (intra_create_variable_infos): Mark PARAM_NOALIAS tags with is_heapvar. * tree-ssa-operands.c (access_can_touch_variable): Offset based tests do not apply for heapvars. Fix offset test. * gfortran.fortran-torture/compile/pr37236.f: New testcase. From-SVN: r139763 --- gcc/ChangeLog | 8 ++ gcc/testsuite/ChangeLog | 5 ++ .../compile/pr37236.f | 82 +++++++++++++++++++ gcc/tree-ssa-operands.c | 43 +++++----- gcc/tree-ssa-structalias.c | 1 + 5 files changed, 118 insertions(+), 21 deletions(-) create mode 100644 gcc/testsuite/gfortran.fortran-torture/compile/pr37236.f diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3b80285fd912..87290dccf119 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2008-08-29 Richard Guenther + + PR middle-end/37236 + * tree-ssa-structalias.c (intra_create_variable_infos): Mark + PARAM_NOALIAS tags with is_heapvar. + * tree-ssa-operands.c (access_can_touch_variable): Offset + based tests do not apply for heapvars. Fix offset test. + 2008-08-29 Jan Hubicka * doc/invoke.texi (-fipa-cp): Enabled by default at -O2/-Os/-O3 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 14b4299da7f8..d33671917d55 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-08-29 Richard Guenther + + PR middle-end/37236 + * gfortran.fortran-torture/compile/pr37236.f: New testcase. + 2008-08-29 Richard Guenther PR tree-optimization/37207 diff --git a/gcc/testsuite/gfortran.fortran-torture/compile/pr37236.f b/gcc/testsuite/gfortran.fortran-torture/compile/pr37236.f new file mode 100644 index 000000000000..8f7cc3695680 --- /dev/null +++ b/gcc/testsuite/gfortran.fortran-torture/compile/pr37236.f @@ -0,0 +1,82 @@ +C + SUBROUTINE FFTRC (A,N,X,IWK,WK) +C SPECIFICATIONS FOR ARGUMENTS + INTEGER N,IWK(1) + REAL*8 A(N),WK(1) + COMPLEX*16 X(1) +C SPECIFICATIONS FOR LOCAL VARIABLES + INTEGER ND2P1,ND2,I,MTWO,M,IMAX,ND4,NP2,K,NMK,J + REAL*8 RPI,ZERO,ONE,HALF,THETA,TP,G(2),B(2),Z(2),AI, + 1 AR + COMPLEX*16 XIMAG,ALPH,BETA,GAM,S1,ZD + EQUIVALENCE (GAM,G(1)),(ALPH,B(1)),(Z(1),AR),(Z(2),AI), + 1 (ZD,Z(1)) + DATA ZERO/0.0D0/,HALF/0.5D0/,ONE/1.0D0/,IMAX/24/ + DATA RPI/3.141592653589793D0/ +C FIRST EXECUTABLE STATEMENT + IF (N .NE. 2) GO TO 5 +C N EQUAL TO 2 + ZD = DCMPLX(A(1),A(2)) + THETA = AR + TP = AI + X(2) = DCMPLX(THETA-TP,ZERO) + X(1) = DCMPLX(THETA+TP,ZERO) + GO TO 9005 + 5 CONTINUE +C N GREATER THAN 2 + ND2 = N/2 + ND2P1 = ND2+1 +C MOVE A TO X + J = 1 + DO 6 I=1,ND2 + X(I) = DCMPLX(A(J),A(J+1)) + J = J+2 + 6 CONTINUE +C COMPUTE THE CENTER COEFFICIENT + GAM = DCMPLX(ZERO,ZERO) + DO 10 I=1,ND2 + GAM = GAM + X(I) + 10 CONTINUE + TP = G(1)-G(2) + GAM = DCMPLX(TP,ZERO) +C DETERMINE THE SMALLEST M SUCH THAT +C N IS LESS THAN OR EQUAL TO 2**M + MTWO = 2 + M = 1 + DO 15 I=1,IMAX + IF (ND2 .LE. MTWO) GO TO 20 + MTWO = MTWO+MTWO + M = M+1 + 15 CONTINUE + 20 IF (ND2 .EQ. MTWO) GO TO 25 +C N IS NOT A POWER OF TWO, CALL FFTCC + CALL FFTCC (X,ND2,IWK,WK) + GO TO 30 +C N IS A POWER OF TWO, CALL FFT2C + 25 CALL FFT2C (X,M,IWK) + 30 ALPH = X(1) + X(1) = B(1) + B(2) + ND4 = (ND2+1)/2 + IF (ND4 .LT. 2) GO TO 40 + NP2 = ND2 + 2 + THETA = RPI/ND2 + TP = THETA + XIMAG = DCMPLX(ZERO,ONE) +C DECOMPOSE THE COMPLEX VECTOR X +C INTO THE COMPONENTS OF THE TRANSFORM +C OF THE INPUT DATA. + DO 35 K = 2,ND4 + NMK = NP2 - K + S1 = DCONJG(X(NMK)) + ALPH = X(K) + S1 + BETA = XIMAG*(S1-X(K)) + S1 = DCMPLX(DCOS(THETA),DSIN(THETA)) + X(K) = (ALPH+BETA*S1)*HALF + X(NMK) = DCONJG(ALPH-BETA*S1)*HALF + THETA = THETA + TP + 35 CONTINUE + 40 CONTINUE + X(ND2P1) = GAM + 9005 RETURN + END + diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c index 8c94baa5c668..801d2debabbc 100644 --- a/gcc/tree-ssa-operands.c +++ b/gcc/tree-ssa-operands.c @@ -1247,26 +1247,26 @@ access_can_touch_variable (tree ref, tree alias, HOST_WIDE_INT offset, D.874_2 = (*my_char_ref_1)[1]{lb: 1 sz: 1}; */ if (ref - && flag_strict_aliasing - && TREE_CODE (ref) != INDIRECT_REF - && !MTAG_P (alias) - && base - && (TREE_CODE (base) != INDIRECT_REF - || TREE_CODE (TREE_TYPE (base)) != UNION_TYPE) - && (TREE_CODE (base) != INDIRECT_REF - || TREE_CODE (ref) != ARRAY_REF - || offset != 0 - || (DECL_SIZE (alias) - && TREE_CODE (DECL_SIZE (alias)) == INTEGER_CST - && size != -1 - && (unsigned HOST_WIDE_INT)size - != TREE_INT_CST_LOW (DECL_SIZE (alias)))) - && !AGGREGATE_TYPE_P (TREE_TYPE (alias)) - && TREE_CODE (TREE_TYPE (alias)) != COMPLEX_TYPE - && !var_ann (alias)->is_heapvar - /* When the struct has may_alias attached to it, we need not to - return true. */ - && get_alias_set (base)) + && flag_strict_aliasing + && TREE_CODE (ref) != INDIRECT_REF + && !MTAG_P (alias) + && base + && (TREE_CODE (base) != INDIRECT_REF + || TREE_CODE (TREE_TYPE (base)) != UNION_TYPE) + && (TREE_CODE (base) != INDIRECT_REF + || TREE_CODE (ref) != ARRAY_REF + || offset != 0 + || (DECL_SIZE (alias) + && TREE_CODE (DECL_SIZE (alias)) == INTEGER_CST + && size != -1 + && (unsigned HOST_WIDE_INT)size + != TREE_INT_CST_LOW (DECL_SIZE (alias)))) + && !AGGREGATE_TYPE_P (TREE_TYPE (alias)) + && TREE_CODE (TREE_TYPE (alias)) != COMPLEX_TYPE + && !var_ann (alias)->is_heapvar + /* When the struct has may_alias attached to it, we need not to + return true. */ + && get_alias_set (base)) { #ifdef ACCESS_DEBUGGING fprintf (stderr, "Access to "); @@ -1285,11 +1285,12 @@ access_can_touch_variable (tree ref, tree alias, HOST_WIDE_INT offset, && flag_strict_aliasing && TREE_CODE (ref) != INDIRECT_REF && !MTAG_P (alias) + && !var_ann (alias)->is_heapvar && !POINTER_TYPE_P (TREE_TYPE (alias)) && offsetgtz && DECL_SIZE (alias) && TREE_CODE (DECL_SIZE (alias)) == INTEGER_CST - && uoffset > TREE_INT_CST_LOW (DECL_SIZE (alias))) + && uoffset >= TREE_INT_CST_LOW (DECL_SIZE (alias))) { #ifdef ACCESS_DEBUGGING fprintf (stderr, "Access to "); diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index 7ed37a597622..db0912abe8a2 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -4551,6 +4551,7 @@ intra_create_variable_infos (void) heapvar_insert (t, heapvar); ann = get_var_ann (heapvar); + ann->is_heapvar = 1; if (flag_argument_noalias == 1) ann->noalias_state = NO_ALIAS; else if (flag_argument_noalias == 2)