From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id D15B53858C5F; Thu, 9 Feb 2023 20:22:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D15B53858C5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675974134; bh=aYbEtv+ec2mhFsTCRJBYXOCPXpTX+gAmtRpVLW6wXAE=; h=From:To:Subject:Date:From; b=YnojYfrc7p0cuLCeuPvCLUt9q4KhijD1ywzGSe2GMvD5WayGGqCIxvW2iqCPrUwhQ nju5TRoc3LYyL+XzLwsJUz2/DqsARRtbmlJzey6LU8QstYtZhsh9lL4e+uwwPtdFsa u4IZH9MEFRxinx+ZCLOhM4eG4lqNpA7zq4Zhlt9I= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5760] Fortran: catch invalid kind in character conversion [PR69636, PR103779] X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/master X-Git-Oldrev: b24e9c083093a9e1b1007933a184c02f7ff058db X-Git-Newrev: a618b45ac41cf480f54c4fa4014aed6218931290 Message-Id: <20230209202214.D15B53858C5F@sourceware.org> Date: Thu, 9 Feb 2023 20:22:14 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a618b45ac41cf480f54c4fa4014aed6218931290 commit r13-5760-ga618b45ac41cf480f54c4fa4014aed6218931290 Author: Harald Anlauf Date: Thu Feb 9 21:16:14 2023 +0100 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 Diff: --- gcc/fortran/intrinsic.cc | 3 ++- gcc/testsuite/gfortran.dg/pr103779.f90 | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/intrinsic.cc b/gcc/fortran/intrinsic.cc index 68f481473b4..17ee999c3b9 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 00000000000..3d76c901e75 --- /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" }