summaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2018-05-27 17:31:26 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2018-05-27 17:31:26 +0000
commitb6e841a699fe43ddf632dd79e0002dd51c8bf864 (patch)
tree2bbd87f3ef4495f4647af69248548e2a0674e449 /gcc/fortran
parentf5435230c9eabde57c2c87d046ed98792e896c6f (diff)
downloadgcc-b6e841a699fe43ddf632dd79e0002dd51c8bf864.tar.gz
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
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/decl.c15
2 files changed, 19 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 63d42976676..95914aea938 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 bd343b2b163..2fca8ad1f5d 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;