public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-10106] Fortran: improve error recovery for EXTENDS_TYPE_OF() [PR106121]
@ 2022-07-03 20:13 Harald Anlauf
  0 siblings, 0 replies; only message in thread
From: Harald Anlauf @ 2022-07-03 20:13 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:19f6e8ddfc447ac3b6198ab4b0176323e75a65cc

commit r11-10106-g19f6e8ddfc447ac3b6198ab4b0176323e75a65cc
Author: Harald Anlauf <anlauf@gmx.de>
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 <kargl@gcc.gnu.org>
    (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 c9334b9b725..85ea1311c7e 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -3092,6 +3092,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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-07-03 20:13 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-03 20:13 [gcc r11-10106] Fortran: improve error recovery for EXTENDS_TYPE_OF() [PR106121] Harald Anlauf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).