diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2009-06-11 20:11:59 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2009-06-11 20:11:59 +0000 |
| commit | abeab93869b150cb26b4267d14e3362dadb0a8be (patch) | |
| tree | 84a4f811b1cf5dfc12a4245722cba5b630981ecf | |
| parent | 5514b0f3df6c51607ad1bb941967aafe149c77b3 (diff) | |
| download | gcc-abeab93869b150cb26b4267d14e3362dadb0a8be.zip gcc-abeab93869b150cb26b4267d14e3362dadb0a8be.tar.gz gcc-abeab93869b150cb26b4267d14e3362dadb0a8be.tar.bz2 | |
re PR fortran/40402 (Problem with data statement involving structure constructors containing non-initialisation expressions)
2009-06-11 Paul Thomas <pault@gcc.gnu.org>
PR fortran/40402
* resolve.c (next_data_value): It is an error if the value is
not constant.
2009-06-11 Paul Thomas <pault@gcc.gnu.org>
PR fortran/40402
* gfortran.dg/data_value_1.f90: New test.
From-SVN: r148396
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/data_value_1.f90 | 14 |
4 files changed, 29 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1a2f41b..2f0ff9d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2009-06-11 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/40402 + * resolve.c (next_data_value): It is an error if the value is + not constant. + 2009-06-11 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> PR fortran/38718 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 5bb38fe..04e03cc 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -9852,9 +9852,12 @@ values; static gfc_try next_data_value (void) { - while (mpz_cmp_ui (values.left, 0) == 0) { + if (!gfc_is_constant_expr (values.vnode->expr)) + gfc_error ("non-constant DATA value at %L", + &values.vnode->expr->where); + if (values.vnode->next == NULL) return FAILURE; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9a36bad..d49243f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-06-11 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/40402 + * gfortran.dg/data_value_1.f90: New test. + 2009-06-11 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> PR testsuite/39831 diff --git a/gcc/testsuite/gfortran.dg/data_value_1.f90 b/gcc/testsuite/gfortran.dg/data_value_1.f90 new file mode 100644 index 0000000..ea05a91 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/data_value_1.f90 @@ -0,0 +1,14 @@ +! { dg-do compile } +! Test the fix for PR40402, in which it was not detected that X +! is not a constant and so the DATA statement did not have +! a constant value expression. +! +! Contributed by Philippe Marguinaud <philippe.marguinaud@meteo.fr> +! + TYPE POINT + REAL :: X + ENDTYPE + TYPE(POINT) :: P + DATA P / POINT(1.+X) / ! { dg-error "non-constant DATA value" } + print *, p + END |