diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2023-02-09 21:16:14 +0100 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2023-02-09 21:21:06 +0100 |
| commit | a618b45ac41cf480f54c4fa4014aed6218931290 (patch) | |
| tree | 165dffb664099504dfb578313cffb9d4e3c23f2a /gcc | |
| parent | b24e9c083093a9e1b1007933a184c02f7ff058db (diff) | |
| download | gcc-a618b45ac41cf480f54c4fa4014aed6218931290.zip gcc-a618b45ac41cf480f54c4fa4014aed6218931290.tar.gz gcc-a618b45ac41cf480f54c4fa4014aed6218931290.tar.bz2 | |
Fortran: catch invalid kind in character conversion [PR69636,PR103779]
gcc/fortran/ChangeLog:
PR fortran/69636
PR fortran/103779
* intrinsic.cc (gfc_convert_chartype): Recover on invalid character
kind in conversion instead of generating an internal error.
gcc/testsuite/ChangeLog:
PR fortran/69636
PR fortran/103779
* gfortran.dg/pr103779.f90: New test.
Co-authored-by: Steven G. Kargl <kargl@gcc.gnu.org>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/intrinsic.cc | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr103779.f90 | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/gcc/fortran/intrinsic.cc b/gcc/fortran/intrinsic.cc index 68f4814..17ee999 100644 --- a/gcc/fortran/intrinsic.cc +++ b/gcc/fortran/intrinsic.cc @@ -5419,7 +5419,8 @@ gfc_convert_chartype (gfc_expr *expr, gfc_typespec *ts) gcc_assert (expr->ts.type == BT_CHARACTER && ts->type == BT_CHARACTER); sym = find_char_conv (&expr->ts, ts); - gcc_assert (sym); + if (sym == NULL) + return false; /* Insert a pre-resolved function call to the right function. */ old_where = expr->where; diff --git a/gcc/testsuite/gfortran.dg/pr103779.f90 b/gcc/testsuite/gfortran.dg/pr103779.f90 new file mode 100644 index 0000000..3d76c90 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr103779.f90 @@ -0,0 +1,18 @@ +! { dg-do compile } +! PR fortran/69636 +! PR fortran/103779 +! Contributed by G.Steinmetz + +character(1,) function f() ! { dg-error "Expected initialization expression" } + f = 'a' +end + +character(1,kind=) function g() ! { dg-error "Expected initialization expression" } + g = 'a' +end + +character(1,n) function h() ! { dg-error "has not been declared" } + h = 'a' +end + +! { dg-prune-output "Bad kind expression" } |