From ef3e6aa32043fd8a285342aa6c668b636f5f0d41 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Wed, 19 Jun 2019 18:18:40 +0000 Subject: [PATCH] re PR fortran/69499 ([F03] ICE-on-invalid on combining select type with wrong statement) 2019-06-19 Steven G. Kargl PR fortran/69499 * match.c (gfc_match_select_type): SELECT TYPE is an executable statement, and cannot appear in MODULE or SUBMODULE scope. 2019-06-19 Steven G. Kargl PR fortran/69499 * gfortran.dg/pr69499.f90: New test. * gfortran.dg/module_error_1.f90: Update dg-error string. From-SVN: r272482 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/match.c | 7 +++++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gfortran.dg/module_error_1.f90 | 2 +- gcc/testsuite/gfortran.dg/pr69499.f90 | 7 +++++++ 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr69499.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2014342f9da..bf54e29271b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2019-06-19 Steven G. Kargl + + PR fortran/69499 + * match.c (gfc_match_select_type): SELECT TYPE is an executable + statement, and cannot appear in MODULE or SUBMODULE scope. + 2019-06-19 Steven G. Kargl PR fortran/69398 diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index 69698e5ba2e..1c08da7f43f 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -6219,6 +6219,13 @@ gfc_match_select_type (void) if (m != MATCH_YES) return m; + if (gfc_current_state() == COMP_MODULE + || gfc_current_state() == COMP_SUBMODULE) + { + gfc_error ("SELECT TYPE at %C cannot appear in this scope"); + return MATCH_ERROR; + } + gfc_current_ns = gfc_build_block_ns (ns); m = gfc_match (" %n => %e", name, &expr2); if (m == MATCH_YES) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5b81695aa24..bb2e848a743 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-06-19 Steven G. Kargl + + PR fortran/69499 + * gfortran.dg/pr69499.f90: New test. + * gfortran.dg/module_error_1.f90: Update dg-error string. + 2019-06-19 Steven G. Kargl PR fortran/69398 diff --git a/gcc/testsuite/gfortran.dg/module_error_1.f90 b/gcc/testsuite/gfortran.dg/module_error_1.f90 index 84decc0a571..1792be6e9fa 100644 --- a/gcc/testsuite/gfortran.dg/module_error_1.f90 +++ b/gcc/testsuite/gfortran.dg/module_error_1.f90 @@ -1,5 +1,5 @@ ! { dg-do compile } ! PR fortran/50627 module kernels - select type (args) ! { dg-error "Unexpected SELECT TYPE" } + select type (args) ! { dg-error "cannot appear in this scope" } end module kernels diff --git a/gcc/testsuite/gfortran.dg/pr69499.f90 b/gcc/testsuite/gfortran.dg/pr69499.f90 new file mode 100644 index 00000000000..169c6ced515 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr69499.f90 @@ -0,0 +1,7 @@ +! { dg-do compile } +! PR fortran/69499 +! Contributed by Gerhard Steinmetz. +module m + class(*) :: z ! { dg-error "must be dummy, allocatable or pointer" } + select type (x => z) ! { dg-error "cannot appear in this scope" } +end -- 2.30.2