diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-05-27 17:31:26 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-05-27 17:31:26 +0000 |
| commit | b6e841a699fe43ddf632dd79e0002dd51c8bf864 (patch) | |
| tree | 2bbd87f3ef4495f4647af69248548e2a0674e449 | |
| parent | f5435230c9eabde57c2c87d046ed98792e896c6f (diff) | |
| download | gcc-b6e841a699fe43ddf632dd79e0002dd51c8bf864.zip gcc-b6e841a699fe43ddf632dd79e0002dd51c8bf864.tar.gz gcc-b6e841a699fe43ddf632dd79e0002dd51c8bf864.tar.bz2 | |
decl.c (match_data_constant): Fortran 2018 allows pointer initialization in a data statement.
2018-05-27 Steven G. Kargl <kargl@gcc.gnu.org>
* decl.c (match_data_constant): Fortran 2018 allows pointer
initialization in a data statement.
2018-05-27 Steven G. Kargl <kargl@gcc.gnu.org>
* gfortran.dg/data_stmt_pointer.f90: new test.
From-SVN: r260808
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 15 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/data_stmt_pointer.f90 | 19 |
4 files changed, 42 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 63d4297..95914ae 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2018-05-27 Steven G. Kargl <kargl@gcc.gnu.org> + + * decl.c (match_data_constant): Fortran 2018 allows pointer + initialization in a data statement. + 2018-05-25 Janus Weil <janus@gcc.gnu.org> PR fortran/85839 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index bd343b2..2fca8ad 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -387,7 +387,20 @@ match_data_constant (gfc_expr **result) return m; } else if (m == MATCH_YES) - gfc_free_expr (*result); + { + /* F2018:R845 data-stmt-constant is initial-data-target. + A data-stmt-constant shall be ... initial-data-target if and + only if the corresponding data-stmt-object has the POINTER + attribute. ... If data-stmt-constant is initial-data-target + the corresponding data statement object shall be + data-pointer-initialization compatible (7.5.4.6) with the initial + data target; the data statement object is initially associated + with the target. */ + if ((*result)->symtree->n.sym->attr.save + && (*result)->symtree->n.sym->attr.target) + return m; + gfc_free_expr (*result); + } gfc_current_locus = old_loc; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a897b47..0ec5cee 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2018-05-27 Steven G. Kargl <kargl@gcc.gnu.org> + + * gfortran.dg/data_stmt_pointer.f90: new test. + 2018-05-27 Jakub Jelinek <jakub@redhat.com> PR target/85918 diff --git a/gcc/testsuite/gfortran.dg/data_stmt_pointer.f90 b/gcc/testsuite/gfortran.dg/data_stmt_pointer.f90 new file mode 100644 index 0000000..923860e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/data_stmt_pointer.f90 @@ -0,0 +1,19 @@ +! { dg-do run } +program foo + real, pointer :: p + real, save, target :: x = 42 + data p / x / + if (p /= 42) stop 1 + call bar +end program foo + +subroutine bar + type bah + integer, pointer :: p + end type bah + type(bah) a + integer, save, target :: i = 42 + data a%p / i / + if (a%p /= 42) stop 2 +end subroutine + |