diff options
| author | Mark Eggleston <markeggleston@gcc.gnu.org> | 2020-02-18 10:00:50 +0000 |
|---|---|---|
| committer | Mark Eggleston <markeggleston@gcc.gnu.org> | 2020-02-18 10:00:50 +0000 |
| commit | d4c10c9f4bff616e7ed07e92504fe31a700e2af1 (patch) | |
| tree | 72b83cccb0605d3367f12ddf4d03494ae62e3496 /gcc | |
| parent | da67227bfc407dd1412b3396ed962f30084f9401 (diff) | |
| download | gcc-d4c10c9f4bff616e7ed07e92504fe31a700e2af1.zip gcc-d4c10c9f4bff616e7ed07e92504fe31a700e2af1.tar.gz gcc-d4c10c9f4bff616e7ed07e92504fe31a700e2af1.tar.bz2 | |
[fortran] ICE in gfc_validate_kind(): Got bad kind [PR93580]
Caused by using invalid part_refs in kind specifications,
e.g. %re or %im on non-complex expressions and %len on
non character expressions.
Check whether %re, %im and %len are valid when checking
kind specification.
The original patch from Steven G. Kargl <kargl@gcc.gnu.org> only
checked for %re and %im.
gcc/fortran/ChangeLog:
PR fortran/93580
* primary.c (gfc_match_varspec): If the symbol following %
is re or im and the primary expression type is not BT_COMPLEX
issue an error. If the symbol is len and the primary
expression type is not BT_CHARACTER is an error.
gcc/testsuite/ChangeLog:
PR fortran/93580
* gfortran.dg/dg/pr93580.f90: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/fortran/primary.c | 24 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr93580.f90 | 13 |
4 files changed, 49 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a2f45d2..302af3a 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2020-02-18 Steven G. Kargl <kargl@gcc.gnu.org> + Mark Eggleston <markeggleston@gcc.gnu.org> + + PR fortran/93580 + * primary.c (gfc_match_varspec): If the symbol following % + is re or im and the primary expression type is not BT_COMPLEX + issue an error. If the symbol is len and the primary + expression type is not BT_CHARACTER is an error. + 2020-02-10 Andrew Benson <abensonca@gmail.com> PR fortran/83113 diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index bd50827..d738984 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -2241,8 +2241,28 @@ gfc_match_varspec (gfc_expr *primary, int equiv_flag, bool sub_flag, if (inquiry) sym = NULL; - if (sep == '%' && primary->ts.type != BT_UNKNOWN) - intrinsic = true; + if (sep == '%') + { + if (tmp) + { + if ((tmp->u.i == INQUIRY_RE || tmp->u.i == INQUIRY_IM) + && primary->ts.type != BT_COMPLEX) + { + gfc_error ("The RE or IM part_ref at %C must be " + "applied to a COMPLEX expression"); + return MATCH_ERROR; + } + else if (tmp->u.i == INQUIRY_LEN + && primary->ts.type != BT_CHARACTER) + { + gfc_error ("The LEN part_ref at %C must be applied " + "to a CHARACTER expression"); + return MATCH_ERROR; + } + } + if (primary->ts.type != BT_UNKNOWN) + intrinsic = true; + } } else inquiry = false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8f2c5b0..1c7f879 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-02-20 Mark Eggleston <markeggleston@gcc.gnu.org> + + PR fortran/93580 + * gfortran.dg/dg/pr93580.f90: New test. + 2020-02-18 Jakub Jelinek <jakub@redhat.com> PR tree-optimization/93780 diff --git a/gcc/testsuite/gfortran.dg/pr93580.f90 b/gcc/testsuite/gfortran.dg/pr93580.f90 new file mode 100644 index 0000000..4feaa11 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr93580.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! PR fortran/93580 + +program p + integer, parameter :: n = 4 + complex(n%re) :: x ! { dg-error "The RE or IM part_ref at" } + complex(n%im) :: y ! { dg-error "The RE or IM part_ref at" } + complex(n%len) :: z ! { dg-error "The LEN part_ref at" } + character(n%im) :: a ! { dg-error "The RE or IM part_ref at" } + character(n%re) :: b ! { dg-error "The RE or IM part_ref at" } + character(n%len) :: c ! { dg-error "The LEN part_ref at" } +end + |