diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2019-06-22 19:58:47 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2019-06-22 19:58:47 +0000 |
| commit | b1be0054be0149ad735e662912e01ebd258cea49 (patch) | |
| tree | ce4faece62008dcdeb8ded3738ea6ae5fa589eb3 | |
| parent | d9fe6cc4251d68866779f3e8d86af1a050fa2ae5 (diff) | |
| download | gcc-b1be0054be0149ad735e662912e01ebd258cea49.zip gcc-b1be0054be0149ad735e662912e01ebd258cea49.tar.gz gcc-b1be0054be0149ad735e662912e01ebd258cea49.tar.bz2 | |
re PR fortran/89782 (Can do an internal READ of a character array when it is a parameter, but not a scalar character parameter)
2019-06-22 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/89782
* io.c (gfc_resolve_dt): Check that internal units are not
character PARAMETER.
* gfortran.dg/io_constraints.f90: New test.
From-SVN: r272594
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/io.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/io_constraints_14.f90 | 13 |
4 files changed, 32 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4289227..6489a04 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2019-06-22 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR fortran/89782 + * io.c (gfc_resolve_dt): Check that internal units are not + character PARAMETER. + 2019-06-21 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/67884 diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c index 425c2b8..cd21c6b 100644 --- a/gcc/fortran/io.c +++ b/gcc/fortran/io.c @@ -3328,6 +3328,14 @@ gfc_resolve_dt (gfc_dt *dt, locus *loc) return false; } + if (e->symtree && e->symtree->n.sym->attr.flavor == FL_PARAMETER + && e->ts.type == BT_CHARACTER) + { + gfc_error ("UNIT specification at %L must " + "not be a character PARAMETER", &e->where); + return false; + } + if (gfc_resolve_expr (e) && (e->ts.type != BT_INTEGER && (e->ts.type != BT_CHARACTER || e->expr_type != EXPR_VARIABLE))) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e4f4cf8..edd7064 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-06-22 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR fortran/89782 + * gfortran.dg/io_constraints.f90: New test. + 2019-06-22 Iain Sandoe <iain@sandoe.co.uk> * gcc.target/powerpc/pr64205.c: Require effective target dfp. diff --git a/gcc/testsuite/gfortran.dg/io_constraints_14.f90 b/gcc/testsuite/gfortran.dg/io_constraints_14.f90 new file mode 100644 index 0000000..e5b62b1 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/io_constraints_14.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +program pr89782 + character(len=*),parameter :: VALUES(*)=[character(len=10) :: 'NaN','NAN','nan','Inf','INF','inf','Infinity'] + character(len=*),parameter :: VALUE='NaN' + real(4) :: var + do i=1,size(VALUES) + read(VALUES(i),*) float ! { dg-error "character PARAMETER" } + write(VALUES(i),*)float ! { dg-error "character PARAMETER" } + enddo + read(var,*)float ! { dg-error "INTEGER expression or a CHARACTER" } + read(VALUE,*)float ! { dg-error "character PARAMETER" } + write(VALUE,*)float ! { dg-error "character PARAMETER" } +end program pr89782 |