From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 0A4F03858D37; Wed, 2 Mar 2022 18:23:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0A4F03858D37 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 r12-7456] Fortran: error recovery after invalid assumed type declaration X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/master X-Git-Oldrev: 38c1731193fe12d951f3010880406505507d90c1 X-Git-Newrev: 12463f1ecbcb30b39b8212454a6e598645123305 Message-Id: <20220302182345.0A4F03858D37@sourceware.org> Date: Wed, 2 Mar 2022 18:23:45 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Mar 2022 18:23:45 -0000 https://gcc.gnu.org/g:12463f1ecbcb30b39b8212454a6e598645123305 commit r12-7456-g12463f1ecbcb30b39b8212454a6e598645123305 Author: Harald Anlauf Date: Tue Mar 1 23:13:17 2022 +0100 Fortran: error recovery after invalid assumed type declaration gcc/fortran/ChangeLog: PR fortran/104573 * resolve.cc (resolve_structure_cons): Avoid NULL pointer dereference when there is no valid component. gcc/testsuite/ChangeLog: PR fortran/104573 * gfortran.dg/assumed_type_14.f90: New test. Diff: --- gcc/fortran/resolve.cc | 10 +++++++--- gcc/testsuite/gfortran.dg/assumed_type_14.f90 | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 753aa27e23f..0afa5d3346a 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -1288,15 +1288,19 @@ resolve_structure_cons (gfc_expr *expr, int init) } } - cons = gfc_constructor_first (expr->value.constructor); - /* A constructor may have references if it is the result of substituting a parameter variable. In this case we just pull out the component we want. */ if (expr->ref) comp = expr->ref->u.c.sym->components; - else + else if ((expr->ts.type == BT_DERIVED || expr->ts.type == BT_CLASS + || expr->ts.type == BT_UNION) + && expr->ts.u.derived) comp = expr->ts.u.derived->components; + else + return false; + + cons = gfc_constructor_first (expr->value.constructor); for (; comp && cons; comp = comp->next, cons = gfc_constructor_next (cons)) { diff --git a/gcc/testsuite/gfortran.dg/assumed_type_14.f90 b/gcc/testsuite/gfortran.dg/assumed_type_14.f90 new file mode 100644 index 00000000000..112cde34b27 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/assumed_type_14.f90 @@ -0,0 +1,22 @@ +! { dg-do compile } +! PR fortran/104573 - ICE in resolve_structure_cons +! Contributed by G.Steinmetz +! Contributed by M.Morin + +program p + type t + end type + type(*), parameter :: x = t() ! { dg-error "Assumed type of variable" } + print *, x +end + +subroutine s + type t + integer :: a + end type + character(3), parameter :: x = t(2) ! { dg-error "Cannot convert" } + character(3), parameter :: y = x ! { dg-error "Unclassifiable statement" } + print *, y +end + +! { dg-prune-output "Cannot convert" }