From: Francois-Xavier Coudert Date: Fri, 6 Jun 2014 19:57:51 +0000 (+0000) Subject: io.c (resolve_tag): Warn on non-default kind for NUMBER... X-Git-Tag: releases/gcc-5.1.0~7033 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72b572cbb3a3d90cfbbaa0b6ee1bc13a0d42f9a4;p=thirdparty%2Fgcc.git io.c (resolve_tag): Warn on non-default kind for NUMBER... * io.c (resolve_tag): Warn on non-default kind for NUMBER, NEXTREC, RECL, NAMED, OPENED and PENDING I/O specifiers. * gfortran.dg/io_constraints_11.f90: New file. * gfortran.dg/io_constraints_12.f90: New file. * gfortran.dg/io_constraints_13.f90: New file. From-SVN: r211323 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a62e8a742539..c292130e3961 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2014-06-06 Francois-Xavier Coudert + + * io.c (resolve_tag): Warn on non-default kind for NUMBER, + NEXTREC, RECL, NAMED, OPENED and PENDING I/O specifiers. + 2014-06-06 Jakub Jelinek * dump-parse-tree.c (show_omp_namelist): Dump reduction diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c index 84d0db818de3..731c6dcc5678 100644 --- a/gcc/fortran/io.c +++ b/gcc/fortran/io.c @@ -1497,7 +1497,8 @@ resolve_tag (const io_tag *tag, gfc_expr *e) return false; } - if ((tag == &tag_iostat || tag == &tag_size || tag == &tag_iolength) + if ((tag == &tag_iostat || tag == &tag_size || tag == &tag_iolength + || tag == &tag_number || tag == &tag_nextrec || tag == &tag_s_recl) && e->ts.kind != gfc_default_integer_kind) { if (!gfc_notify_std (GFC_STD_F2003, "Fortran 95 requires default " @@ -1505,9 +1506,11 @@ resolve_tag (const io_tag *tag, gfc_expr *e) return false; } - if (tag == &tag_exist && e->ts.kind != gfc_default_logical_kind) + if (e->ts.kind != gfc_default_logical_kind && + (tag == &tag_exist || tag == &tag_named || tag == &tag_opened + || tag == &tag_pending)) { - if (!gfc_notify_std (GFC_STD_F2008, "Nondefault LOGICAL " + if (!gfc_notify_std (GFC_STD_F2008, "Non-default LOGICAL kind " "in %s tag at %L", tag->name, &e->where)) return false; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index eba01f090aeb..d2e2a4b4683a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-06-06 Francois-Xavier Coudert + + * gfortran.dg/io_constraints_11.f90: New file. + * gfortran.dg/io_constraints_12.f90: New file. + * gfortran.dg/io_constraints_13.f90: New file. + 2014-06-06 Uros Bizjak PR target/61423 diff --git a/gcc/testsuite/gfortran.dg/io_constraints_11.f90 b/gcc/testsuite/gfortran.dg/io_constraints_11.f90 new file mode 100644 index 000000000000..911c866025fb --- /dev/null +++ b/gcc/testsuite/gfortran.dg/io_constraints_11.f90 @@ -0,0 +1,36 @@ +! { dg-do compile } +! { dg-options "-std=f95" } +! +! Test our conformance to item 4.9 ("Kind type parameters of integer +! specifiers") of the Fortran 2003 status document at +! ftp://ftp.nag.co.uk/sc22wg5/N1551-N1600/N1579.pdf +! +! The non-default integer variables are allowed since Fortran 2003. +! The non-default logical variables are allowed since Fortran 2008. + + integer(kind=8) :: i, j, k, n + logical(kind=8) :: l1, l2, l3 + + open(10, status="scratch", iostat=i) ! { dg-error "requires default INTEGER" } + + backspace(10, iostat=i) ! { dg-error "requires default INTEGER" } + endfile(10, iostat=i) ! { dg-error "requires default INTEGER" } + rewind(10, iostat=i) ! { dg-error "requires default INTEGER" } + + read(*, '(I2)', iostat=i) k ! { dg-error "requires default INTEGER" } + read(*, '(I2)', advance='no', size=j) k ! { dg-error "requires default INTEGER" } + + inquire(iolength=i) "42" ! { dg-error "requires default INTEGER" } + inquire(10, iostat=i) ! { dg-error "requires default INTEGER" } + inquire(10, number=j) ! { dg-error "requires default INTEGER" } + inquire(10, recl=k) ! { dg-error "requires default INTEGER" } + inquire(10, nextrec=n) ! { dg-error "requires default INTEGER" } + + inquire(10, exist=l1) ! { dg-error "Non-default LOGICAL kind" } + inquire(10, named=l3) ! { dg-error "Non-default LOGICAL kind" } + inquire(10, opened=l2) ! { dg-error "Non-default LOGICAL kind" } + inquire(10, pending=l2) ! { dg-error "Non-default LOGICAL kind" } + + close(10, iostat=i) ! { dg-error "requires default INTEGER" } + +end diff --git a/gcc/testsuite/gfortran.dg/io_constraints_12.f90 b/gcc/testsuite/gfortran.dg/io_constraints_12.f90 new file mode 100644 index 000000000000..78f11c56345c --- /dev/null +++ b/gcc/testsuite/gfortran.dg/io_constraints_12.f90 @@ -0,0 +1,36 @@ +! { dg-do compile } +! { dg-options "-std=f2003" } +! +! Test our conformance to item 4.9 ("Kind type parameters of integer +! specifiers") of the Fortran 2003 status document at +! ftp://ftp.nag.co.uk/sc22wg5/N1551-N1600/N1579.pdf +! +! The non-default integer variables are allowed since Fortran 2003. +! The non-default logical variables are allowed since Fortran 2008. + + integer(kind=8) :: i, j, k, n + logical(kind=8) :: l1, l2, l3 + + open(10, status="scratch", iostat=i) + + backspace(10, iostat=i) + endfile(10, iostat=i) + rewind(10, iostat=i) + + read(*, '(I2)', iostat=i) k + read(*, '(I2)', advance='no', size=j) k + + inquire(iolength=i) "42" + inquire(10, iostat=i) + inquire(10, number=j) + inquire(10, recl=k) + inquire(10, nextrec=n) + + inquire(10, exist=l1) ! { dg-error "Non-default LOGICAL kind" } + inquire(10, named=l3) ! { dg-error "Non-default LOGICAL kind" } + inquire(10, opened=l2) ! { dg-error "Non-default LOGICAL kind" } + inquire(10, pending=l2) ! { dg-error "Non-default LOGICAL kind" } + + close(10, iostat=i) + +end diff --git a/gcc/testsuite/gfortran.dg/io_constraints_13.f90 b/gcc/testsuite/gfortran.dg/io_constraints_13.f90 new file mode 100644 index 000000000000..f57edf71be9b --- /dev/null +++ b/gcc/testsuite/gfortran.dg/io_constraints_13.f90 @@ -0,0 +1,35 @@ +! { dg-do compile } +! +! Test our conformance to item 4.9 ("Kind type parameters of integer +! specifiers") of the Fortran 2003 status document at +! ftp://ftp.nag.co.uk/sc22wg5/N1551-N1600/N1579.pdf +! +! The non-default integer variables are allowed since Fortran 2003. +! The non-default logical variables are allowed since Fortran 2008. + + integer(kind=8) :: i, j, k, n + logical(kind=8) :: l1, l2, l3 + + open(10, status="scratch", iostat=i) + + backspace(10, iostat=i) + endfile(10, iostat=i) + rewind(10, iostat=i) + + read(*, '(I2)', iostat=i) k + read(*, '(I2)', advance='no', size=j) k + + inquire(iolength=i) "42" + inquire(10, iostat=i) + inquire(10, number=j) + inquire(10, recl=k) + inquire(10, nextrec=n) + + inquire(10, exist=l1) + inquire(10, named=l3) + inquire(10, opened=l2) + inquire(10, pending=l2) + + close(10, iostat=i) + +end