public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r9-9873] Fortran: fix checking of elemental functions of type CLASS
@ 2021-12-16 22:38 Harald Anlauf
  0 siblings, 0 replies; only message in thread
From: Harald Anlauf @ 2021-12-16 22:38 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:12d811d06f2ea178ac9b40c5399ba41eb5f374df

commit r9-9873-g12d811d06f2ea178ac9b40c5399ba41eb5f374df
Author: Harald Anlauf <anlauf@gmx.de>
Date:   Fri Dec 10 22:41:24 2021 +0100

    Fortran: fix checking of elemental functions of type CLASS
    
    gcc/fortran/ChangeLog:
    
            PR fortran/103606
            * resolve.c (resolve_fl_procedure): Do not access CLASS components
            before class container has been built.
    
    gcc/testsuite/ChangeLog:
    
            PR fortran/103606
            * gfortran.dg/pr103606.f90: New test.
    
    (cherry picked from commit 7e913caad081ea85da4f257265f2d3383cdbe8d5)

Diff:
---
 gcc/fortran/resolve.c                  |  3 ++-
 gcc/testsuite/gfortran.dg/pr103606.f90 | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 9181a6fa2ac..189eac82e5a 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -12744,7 +12744,8 @@ resolve_fl_procedure (gfc_symbol *sym, int mp_flag)
 
   /* An elemental function is required to return a scalar 12.7.1  */
   if (sym->attr.elemental && sym->attr.function
-      && (sym->as || (sym->ts.type == BT_CLASS && CLASS_DATA (sym)->as)))
+      && (sym->as || (sym->ts.type == BT_CLASS && sym->attr.class_ok
+		      && CLASS_DATA (sym)->as)))
     {
       gfc_error ("ELEMENTAL function %qs at %L must have a scalar "
 		 "result", sym->name, &sym->declared_at);
diff --git a/gcc/testsuite/gfortran.dg/pr103606.f90 b/gcc/testsuite/gfortran.dg/pr103606.f90
new file mode 100644
index 00000000000..43283184e89
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr103606.f90
@@ -0,0 +1,12 @@
+! { dg-do compile }
+! PR fortran/103606 -  ICE in resolve_fl_procedure
+! Contributed by G.Steinmetz
+
+program p
+  type t
+  end type
+contains
+  elemental function f() result(z) ! { dg-error "CLASS variable" }
+    class(t) :: z
+  end
+end


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

only message in thread, other threads:[~2021-12-16 22:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-16 22:38 [gcc r9-9873] Fortran: fix checking of elemental functions of type CLASS 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).