Message ID | trinity-1c63e58d-07b4-4137-a7be-3648399ce8db-1685646310303@3c-app-gmx-bap24 |
---|---|
State | New |
Headers | show |
Series | Fortran: force error on bad KIND specifier [PR88552] | expand |
Hello, Le 01/06/2023 à 21:05, Harald Anlauf via Fortran a écrit : > Dear all, > > we sometimes silently accept wrong declarations with unbalanced > parentheses, as the PR and testcases therein show. > > It appears that the fix is obvious: use the existing error paths in > gfc_match_kind_spec and error return from gfc_match_decl_type_spec. > I'm still posting it here in case I have missed something not so > obvious. > > The patch regtests cleanly on x86_64-pc-linux-gnu. OK for mainline? > It looks good, but... > Thanks, > Harald > > From a30ff5af130c4d33c086fd136978d5f49cb8bde4 Mon Sep 17 00:00:00 2001 > From: Harald Anlauf <anlauf@gmx.de> > Date: Thu, 1 Jun 2023 20:56:11 +0200 > Subject: [PATCH] Fortran: force error on bad KIND specifier [PR88552] > > gcc/fortran/ChangeLog: > > PR fortran/88552 > * decl.cc (gfc_match_kind_spec): Use error path on missing right > parenthesis. > (gfc_match_decl_type_spec): Use error return when an error occurred > during matching a KIND specifier. > > gcc/testsuite/ChangeLog: > > PR fortran/88552 > * gfortran.dg/pr88552.f90: New test. > --- > gcc/fortran/decl.cc | 4 ++++ > gcc/testsuite/gfortran.dg/pr88552.f90 | 6 ++++++ > 2 files changed, 10 insertions(+) > create mode 100644 gcc/testsuite/gfortran.dg/pr88552.f90 > > diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc > index 1de2b231242..deb20647fb9 100644 > --- a/gcc/fortran/decl.cc > +++ b/gcc/fortran/decl.cc > @@ -3366,6 +3366,7 @@ close_brackets: > else > gfc_error ("Missing right parenthesis at %C"); > m = MATCH_ERROR; > + goto no_match; > } > else > /* All tests passed. */ > @@ -4716,6 +4717,9 @@ get_kind: > return MATCH_ERROR; > } > > + if (m == MATCH_ERROR) > + return MATCH_ERROR; > + ... can you move this up to the place where m is set? OK with that change. Thanks
Hi Mikael, Am 01.06.23 um 22:33 schrieb Mikael Morin: > Hello, > > Le 01/06/2023 à 21:05, Harald Anlauf via Fortran a écrit : >> Dear all, >> >> we sometimes silently accept wrong declarations with unbalanced >> parentheses, as the PR and testcases therein show. >> >> It appears that the fix is obvious: use the existing error paths in >> gfc_match_kind_spec and error return from gfc_match_decl_type_spec. >> I'm still posting it here in case I have missed something not so >> obvious. >> >> The patch regtests cleanly on x86_64-pc-linux-gnu. OK for mainline? >> > It looks good, but... > >> Thanks, >> Harald >> >> From a30ff5af130c4d33c086fd136978d5f49cb8bde4 Mon Sep 17 00:00:00 2001 >> From: Harald Anlauf <anlauf@gmx.de> >> Date: Thu, 1 Jun 2023 20:56:11 +0200 >> Subject: [PATCH] Fortran: force error on bad KIND specifier [PR88552] >> >> gcc/fortran/ChangeLog: >> >> PR fortran/88552 >> * decl.cc (gfc_match_kind_spec): Use error path on missing right >> parenthesis. >> (gfc_match_decl_type_spec): Use error return when an error occurred >> during matching a KIND specifier. >> >> gcc/testsuite/ChangeLog: >> >> PR fortran/88552 >> * gfortran.dg/pr88552.f90: New test. >> --- >> gcc/fortran/decl.cc | 4 ++++ >> gcc/testsuite/gfortran.dg/pr88552.f90 | 6 ++++++ >> 2 files changed, 10 insertions(+) >> create mode 100644 gcc/testsuite/gfortran.dg/pr88552.f90 >> >> diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc >> index 1de2b231242..deb20647fb9 100644 >> --- a/gcc/fortran/decl.cc >> +++ b/gcc/fortran/decl.cc >> @@ -3366,6 +3366,7 @@ close_brackets: >> else >> gfc_error ("Missing right parenthesis at %C"); >> m = MATCH_ERROR; >> + goto no_match; >> } >> else >> /* All tests passed. */ >> @@ -4716,6 +4717,9 @@ get_kind: >> return MATCH_ERROR; >> } >> >> + if (m == MATCH_ERROR) >> + return MATCH_ERROR; >> + > ... can you move this up to the place where m is set? > OK with that change. I was afraid that this would regress on the existing testcases pr91660_[12].f90 that depend on an error message emitted just before that hunk, but this turned out not to happen. Adjusted version committed as: r14-1477-gff8f45d20f9ea6acc99442ad29212d177f58e8fe . > Thanks > Thanks for the review! Harald
From a30ff5af130c4d33c086fd136978d5f49cb8bde4 Mon Sep 17 00:00:00 2001 From: Harald Anlauf <anlauf@gmx.de> Date: Thu, 1 Jun 2023 20:56:11 +0200 Subject: [PATCH] Fortran: force error on bad KIND specifier [PR88552] gcc/fortran/ChangeLog: PR fortran/88552 * decl.cc (gfc_match_kind_spec): Use error path on missing right parenthesis. (gfc_match_decl_type_spec): Use error return when an error occurred during matching a KIND specifier. gcc/testsuite/ChangeLog: PR fortran/88552 * gfortran.dg/pr88552.f90: New test. --- gcc/fortran/decl.cc | 4 ++++ gcc/testsuite/gfortran.dg/pr88552.f90 | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/pr88552.f90 diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc index 1de2b231242..deb20647fb9 100644 --- a/gcc/fortran/decl.cc +++ b/gcc/fortran/decl.cc @@ -3366,6 +3366,7 @@ close_brackets: else gfc_error ("Missing right parenthesis at %C"); m = MATCH_ERROR; + goto no_match; } else /* All tests passed. */ @@ -4716,6 +4717,9 @@ get_kind: return MATCH_ERROR; } + if (m == MATCH_ERROR) + return MATCH_ERROR; + /* Defer association of the KIND expression of function results until after USE and IMPORT statements. */ if ((gfc_current_state () == COMP_NONE && gfc_error_flag_test ()) diff --git a/gcc/testsuite/gfortran.dg/pr88552.f90 b/gcc/testsuite/gfortran.dg/pr88552.f90 new file mode 100644 index 00000000000..15e1b372f8f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr88552.f90 @@ -0,0 +1,6 @@ +! { dg-do compile } +! PR fortran/88552 +! Contributed by G.Steinmetz + +integer(len((c)) :: n ! { dg-error "must be CHARACTER" } +end -- 2.35.3