public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-4632] Fortran: name conflict between internal procedure and derived type [PR104351]
@ 2023-10-13 20:08 Harald Anlauf
0 siblings, 0 replies; only message in thread
From: Harald Anlauf @ 2023-10-13 20:08 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:d78fef5371759849944966dec65d9e987efba509
commit r14-4632-gd78fef5371759849944966dec65d9e987efba509
Author: Harald Anlauf <anlauf@gmx.de>
Date: Wed Oct 11 21:29:35 2023 +0200
Fortran: name conflict between internal procedure and derived type [PR104351]
gcc/fortran/ChangeLog:
PR fortran/104351
* decl.cc (get_proc_name): Extend name conflict detection between
internal procedure and previous declaration also to derived type.
gcc/testsuite/ChangeLog:
PR fortran/104351
* gfortran.dg/derived_function_interface_1.f90: Adjust pattern.
* gfortran.dg/pr104351.f90: New test.
Diff:
---
gcc/fortran/decl.cc | 4 +++-
gcc/testsuite/gfortran.dg/derived_function_interface_1.f90 | 2 +-
gcc/testsuite/gfortran.dg/pr104351.f90 | 14 ++++++++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc
index 4a3c5b86de0..bdd3be32a46 100644
--- a/gcc/fortran/decl.cc
+++ b/gcc/fortran/decl.cc
@@ -1404,7 +1404,9 @@ get_proc_name (const char *name, gfc_symbol **result, bool module_fcn_entry)
/* Trap declarations of attributes in encompassing scope. The
signature for this is that ts.kind is nonzero for no-CLASS
entity. For a CLASS entity, ts.kind is zero. */
- if ((sym->ts.kind != 0 || sym->ts.type == BT_CLASS)
+ if ((sym->ts.kind != 0
+ || sym->ts.type == BT_CLASS
+ || sym->ts.type == BT_DERIVED)
&& !sym->attr.implicit_type
&& sym->attr.proc == 0
&& gfc_current_ns->parent != NULL
diff --git a/gcc/testsuite/gfortran.dg/derived_function_interface_1.f90 b/gcc/testsuite/gfortran.dg/derived_function_interface_1.f90
index 24a00950912..5438ad49c6a 100644
--- a/gcc/testsuite/gfortran.dg/derived_function_interface_1.f90
+++ b/gcc/testsuite/gfortran.dg/derived_function_interface_1.f90
@@ -38,7 +38,7 @@ end function ext_fun
contains
- type(foo) function fun() ! { dg-error "already has an explicit interface" }
+ type(foo) function fun() ! { dg-error "has an explicit interface" }
end function fun ! { dg-error "Expecting END PROGRAM" }
end
diff --git a/gcc/testsuite/gfortran.dg/pr104351.f90 b/gcc/testsuite/gfortran.dg/pr104351.f90
new file mode 100644
index 00000000000..86b47e03340
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr104351.f90
@@ -0,0 +1,14 @@
+! { dg-do compile }
+! PR fortran/104351
+! Contributed by G.Steinmetz
+
+program p
+ implicit none
+ type t
+ end type
+ type(t) :: f
+contains
+ real function f() result(z) ! { dg-error "has an explicit interface" }
+ z = 0.0 ! { dg-error "assignment" }
+ end function f ! { dg-error "Expecting END PROGRAM" }
+end
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-10-13 20:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-13 20:08 [gcc r14-4632] Fortran: name conflict between internal procedure and derived type [PR104351] 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).