From: Janus Weil <janus@gcc.gnu.org>
Date: Fri, 12 Jun 2009 20:39:39 +0000 (+0200)
Subject: re PR fortran/40176 (Fortran 2003: Procedure pointers with array return value)
X-Git-Tag: releases/gcc-4.5.0~5237
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1d919c362ce6dd1cc74e7d2c0912ea586dcfd4a;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2f0ff9dee8cc..c9025f1a8d06 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 04e03cc659b6..fdde894c6390 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 8904945838fd..c7801d77376d 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 25c018301f31..c7ec4f2f3fc8 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