From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 14E54385840C; Sun, 3 Jul 2022 20:29:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 14E54385840C 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 r10-10881] Fortran: improve error recovery for EXTENDS_TYPE_OF() [PR106121] X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 061f6d2ef7aa6abf98dc3fad85976494aa2738f8 X-Git-Newrev: 8bb7567f5a3e67ab91614d4538eb3a14a5a76274 Message-Id: <20220703202943.14E54385840C@sourceware.org> Date: Sun, 3 Jul 2022 20:29:43 +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: Sun, 03 Jul 2022 20:29:43 -0000 https://gcc.gnu.org/g:8bb7567f5a3e67ab91614d4538eb3a14a5a76274 commit r10-10881-g8bb7567f5a3e67ab91614d4538eb3a14a5a76274 Author: Harald Anlauf Date: Tue Jun 28 22:29:28 2022 +0200 Fortran: improve error recovery for EXTENDS_TYPE_OF() [PR106121] gcc/fortran/ChangeLog: PR fortran/106121 * simplify.c (gfc_simplify_extends_type_of): Do not attempt to simplify when one of the arguments is a CLASS variable that was not properly declared. gcc/testsuite/ChangeLog: PR fortran/106121 * gfortran.dg/extends_type_of_4.f90: New test. Co-authored-by: Steven G. Kargl (cherry picked from commit b8f284d3673004dffae714b56ed663467c2a52a7) Diff: --- gcc/fortran/simplify.c | 4 ++++ gcc/testsuite/gfortran.dg/extends_type_of_4.f90 | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index a4e014a746f..29d4c695302 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -3060,6 +3060,10 @@ gfc_simplify_extends_type_of (gfc_expr *a, gfc_expr *mold) if (UNLIMITED_POLY (a) || UNLIMITED_POLY (mold)) return NULL; + if ((a->ts.type == BT_CLASS && !gfc_expr_attr (a).class_ok) + || (mold->ts.type == BT_CLASS && !gfc_expr_attr (mold).class_ok)) + return NULL; + /* Return .false. if the dynamic type can never be an extension. */ if ((a->ts.type == BT_CLASS && mold->ts.type == BT_CLASS && !gfc_type_is_extension_of diff --git a/gcc/testsuite/gfortran.dg/extends_type_of_4.f90 b/gcc/testsuite/gfortran.dg/extends_type_of_4.f90 new file mode 100644 index 00000000000..64373322387 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/extends_type_of_4.f90 @@ -0,0 +1,20 @@ +! { dg-do compile } +! PR fortran/106121 - ICE in gfc_simplify_extends_type_of +! Contributed by G.Steinmetz + +program p + type t + end type + type(t) :: x + class(t) :: y ! { dg-error "dummy, allocatable or pointer" } + print *, extends_type_of (x, y) +end + +subroutine s + type t + integer :: i + end type + type(t) :: x + class(t) :: y ! { dg-error "dummy, allocatable or pointer" } + stop extends_type_of (x, y) ! { dg-error "STOP code" } +end