diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2019-05-15 21:02:36 +0300 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2019-05-15 21:02:36 +0300 |
| commit | 0c15ebf1bd0d7ec8111acfecf71542acac4115b1 (patch) | |
| tree | d8d96f02445161f81d85ccf4298ddc0a5f9fa39e | |
| parent | 40c81f845c6f1c5e6df74442ca59279090ac1e8d (diff) | |
| download | gcc-0c15ebf1bd0d7ec8111acfecf71542acac4115b1.zip gcc-0c15ebf1bd0d7ec8111acfecf71542acac4115b1.tar.gz gcc-0c15ebf1bd0d7ec8111acfecf71542acac4115b1.tar.bz2 | |
Allow opening file on multiple units
As of Fortran 2018 it's allowed to open the same file on multiple
units.
libgfortran/ChangeLog:
2019-05-15 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/90461
* io/open.c (new_unit): Don't check if the file is already open
for F2018.
testsuite/ChangeLog:
2019-05-15 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/90461
* gfortran.dg/open_errors_2.f90: Add -std=f2008, adjust line number.
* gfortran.dg/open_errors_3.f90: New test.
From-SVN: r271260
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/open_errors_2.f90 | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/open_errors_3.f90 | 11 | ||||
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/io/open.c | 3 |
5 files changed, 27 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a85e383..ffba7ba 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-05-15 Janne Blomqvist <jb@gcc.gnu.org> + + PR fortran/90461 + * gfortran.dg/open_errors_2.f90: Add -std=f2008, adjust line number. + * gfortran.dg/open_errors_3.f90: New test. + 2019-05-15 H.J. Lu <hongjiu.lu@intel.com> PR target/89021 diff --git a/gcc/testsuite/gfortran.dg/open_errors_2.f90 b/gcc/testsuite/gfortran.dg/open_errors_2.f90 index 5b41834..72d63bb 100644 --- a/gcc/testsuite/gfortran.dg/open_errors_2.f90 +++ b/gcc/testsuite/gfortran.dg/open_errors_2.f90 @@ -1,6 +1,7 @@ ! { dg-do run } +! { dg-options "-std=f2008" } ! { dg-shouldfail "runtime error" } -! { dg-output "At line 13.*File already opened" } +! { dg-output "At line 14.*File already opened" } ! PR 65563 - this used to segfault for some versions. variable_1 = 0 diff --git a/gcc/testsuite/gfortran.dg/open_errors_3.f90 b/gcc/testsuite/gfortran.dg/open_errors_3.f90 new file mode 100644 index 0000000..da94956 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/open_errors_3.f90 @@ -0,0 +1,11 @@ +! { dg-do run } +! PR 90461 Open file on multiple units as of F2018 +program openmult + implicit none + character(len=*), parameter :: fname="pr90461.dat" + open(10, file=fname, form="unformatted") + open(11, file=fname, form="unformatted") + close(11) + close(10, status="delete") +end program openmult +! { dg-final { remote_file build delete "pr90461.dat" } } diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 72b70a0..4b5194f 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2019-05-15 Janne Blomqvist <jb@gcc.gnu.org> + + PR fortran/90461 + * io/open.c (new_unit): Don't check if the file is already open + for F2018. + 2019-05-02 Jakub Jelinek <jakub@redhat.com> * Makefile.am (gfor_cdir): Remove $(MULTISUBDIR). diff --git a/libgfortran/io/open.c b/libgfortran/io/open.c index b48afab..d3bb11f 100644 --- a/libgfortran/io/open.c +++ b/libgfortran/io/open.c @@ -515,7 +515,8 @@ new_unit (st_parameter_open *opp, gfc_unit *u, unit_flags *flags) Do not error if opening file preconnected to stdin, stdout, stderr. */ u2 = NULL; - if ((opp->common.flags & IOPARM_OPEN_HAS_FILE) != 0) + if ((opp->common.flags & IOPARM_OPEN_HAS_FILE) != 0 + && !(compile_options.allow_std & GFC_STD_F2018)) u2 = find_file (opp->file, opp->file_len); if (u2 != NULL && (options.stdin_unit < 0 || u2->unit_number != options.stdin_unit) |