diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2017-11-18 18:56:21 +0200 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2017-11-18 18:56:21 +0200 |
| commit | a7037861a77985c3a8bccab9eefc02179694aa8e (patch) | |
| tree | 908f33484497608024b58833bcb92e3cb14a4ed6 /gcc/fortran | |
| parent | 831cf09d60eed9f14cb06e83831cf74ea328a3bf (diff) | |
| download | gcc-a7037861a77985c3a8bccab9eefc02179694aa8e.zip gcc-a7037861a77985c3a8bccab9eefc02179694aa8e.tar.gz gcc-a7037861a77985c3a8bccab9eefc02179694aa8e.tar.bz2 | |
PR 83036 Make NEXTREC specifier for INQUIRE work for large record numbers
This is accomplished by making the NEXTREC specifier be a 8 byte
integer where supported.
I wasn't able to come up with a testcase that does not create a large
file that could be added to the testsuite, but here's one which
creates a 2 GB file:
program nextrec
implicit none
integer(8) :: ii, n
open(10, file="foo.dat", recl=1, access="direct", form="unformatted", &
status="replace")
do ii = 1, huge(1) + 2_8
write(10, rec=ii) 'a'
end do
inquire(10, nextrec=n)
if (n /= huge(1) + 3_8) then
call abort()
end if
close(10, status="delete")
end program nextrec
Regtested on x86_64-pc-linux-gnu.
gcc/fortran/ChangeLog:
2017-11-18 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/83036
* ioparm.def (IOPARM): Make nextrec a pintio.
libgfortran/ChangeLog:
2017-11-18 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/83036
* io/io.h: Make nextrec a GFC_IO_INT*.
---
gcc/fortran/ioparm.def | 2 +-
libgfortran/io/io.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/gcc/fortran/ioparm.def b/gcc/fortran/ioparm.def
index 5fc04bc..59cc7cd 100644
--- a/gcc/fortran/ioparm.def
+++ b/gcc/fortran/ioparm.def
@@ -62,7 +62,7 @@ IOPARM (inquire, exist, 1 << 7, pint4)
IOPARM (inquire, opened, 1 << 8, pint4)
IOPARM (inquire, number, 1 << 9, pint4)
IOPARM (inquire, named, 1 << 10, pint4)
-IOPARM (inquire, nextrec, 1 << 11, pint4)
+IOPARM (inquire, nextrec, 1 << 11, pintio)
IOPARM (inquire, recl_out, 1 << 12, pintio)
IOPARM (inquire, strm_pos_out, 1 << 13, pintio)
IOPARM (inquire, file, 1 << 14, char1)
diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h
index 3330bce..d29b112 100644
--- a/libgfortran/io/io.h
+++ b/libgfortran/io/io.h
@@ -388,8 +388,7 @@ typedef struct
{
st_parameter_common common;
GFC_INTEGER_4 *exist, *opened, *number, *named;
- GFC_INTEGER_4 *nextrec;
- GFC_IO_INT *recl_out, *strm_pos_out;
+ GFC_IO_INT *nextrec, *recl_out, *strm_pos_out;
CHARACTER1 (file);
CHARACTER2 (access);
CHARACTER1 (form);
--
2.7.4
From-SVN: r254916
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/ioparm.def | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4334901..2e8bbd8 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,10 @@ 2017-11-18 Janne Blomqvist <jb@gcc.gnu.org> + PR fortran/83036 + * ioparm.def (IOPARM): Make nextrec a pintio. + +2017-11-18 Janne Blomqvist <jb@gcc.gnu.org> + PR fortran/44292 * ioparm.def (IOPARM): Make recl_in intio, and recl_out pintio. diff --git a/gcc/fortran/ioparm.def b/gcc/fortran/ioparm.def index 5fc04bc..59cc7cd 100644 --- a/gcc/fortran/ioparm.def +++ b/gcc/fortran/ioparm.def @@ -62,7 +62,7 @@ IOPARM (inquire, exist, 1 << 7, pint4) IOPARM (inquire, opened, 1 << 8, pint4) IOPARM (inquire, number, 1 << 9, pint4) IOPARM (inquire, named, 1 << 10, pint4) -IOPARM (inquire, nextrec, 1 << 11, pint4) +IOPARM (inquire, nextrec, 1 << 11, pintio) IOPARM (inquire, recl_out, 1 << 12, pintio) IOPARM (inquire, strm_pos_out, 1 << 13, pintio) IOPARM (inquire, file, 1 << 14, char1) |