aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanus Weil <janus@gcc.gnu.org>2009-06-12 22:39:39 +0200
committerJanus Weil <janus@gcc.gnu.org>2009-06-12 22:39:39 +0200
commitd1d919c362ce6dd1cc74e7d2c0912ea586dcfd4a (patch)
tree238f0e3995b1a5346fd18b34074feb97673a529d
parent3d8b2a98ca3c4d46030c839ad89ed7f3800a9fbf (diff)
downloadgcc-d1d919c362ce6dd1cc74e7d2c0912ea586dcfd4a.zip
gcc-d1d919c362ce6dd1cc74e7d2c0912ea586dcfd4a.tar.gz
gcc-d1d919c362ce6dd1cc74e7d2c0912ea586dcfd4a.tar.bz2
re PR fortran/40176 (Fortran 2003: Procedure pointers with array return value)
2009-06-12 Janus Weil <janus@gcc.gnu.org> PR fortran/40176 * resolve.c (resolve_symbol): Additional error check, preventing an infinite loop. 2009-06-12 Janus Weil <janus@gcc.gnu.org> PR fortran/40176 * gfortran.dg/proc_decl_1.f90: Extended. From-SVN: r148440
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/resolve.c15
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/proc_decl_1.f902
4 files changed, 25 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2f0ff9d..c9025f1 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-12 Janus Weil <janus@gcc.gnu.org>
+
+ PR fortran/40176
+ * resolve.c (resolve_symbol): Additional error check, preventing an
+ infinite loop.
+
2009-06-11 Paul Thomas <pault@gcc.gnu.org>
PR fortran/40402
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 04e03cc..fdde894 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -9406,10 +9406,19 @@ resolve_symbol (gfc_symbol *sym)
if (sym->attr.procedure && sym->ts.interface
&& sym->attr.if_source != IFSRC_DECL)
{
+ if (sym->ts.interface == sym)
+ {
+ gfc_error ("PROCEDURE '%s' at %L may not be used as its own "
+ "interface", sym->name, &sym->declared_at);
+ return;
+ }
if (sym->ts.interface->attr.procedure)
- gfc_error ("Interface '%s', used by procedure '%s' at %L, is declared "
- "in a later PROCEDURE statement", sym->ts.interface->name,
- sym->name,&sym->declared_at);
+ {
+ gfc_error ("Interface '%s', used by procedure '%s' at %L, is declared"
+ " in a later PROCEDURE statement", sym->ts.interface->name,
+ sym->name,&sym->declared_at);
+ return;
+ }
/* Get the attributes from the interface (now resolved). */
if (sym->ts.interface->attr.if_source
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8904945..c7801d7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-12 Janus Weil <janus@gcc.gnu.org>
+
+ PR fortran/40176
+ * gfortran.dg/proc_decl_1.f90: Extended.
+
2009-06-12 Ian Lance Taylor <iant@google.com>
* gcc.dg/Wcxx-compat-13.c: New testcase.
diff --git a/gcc/testsuite/gfortran.dg/proc_decl_1.f90 b/gcc/testsuite/gfortran.dg/proc_decl_1.f90
index 25c0183..c7ec4f2 100644
--- a/gcc/testsuite/gfortran.dg/proc_decl_1.f90
+++ b/gcc/testsuite/gfortran.dg/proc_decl_1.f90
@@ -57,6 +57,8 @@ program prog
procedure ( ) :: r
procedure ( up ) :: s ! { dg-error "must be explicit" }
+ procedure(t) :: t ! { dg-error "may not be used as its own interface" }
+
call s
contains