From: Jerry DeLisle <jvdelisle@gcc.gnu.org>
Date: Sat, 28 Jul 2007 21:17:20 +0000 (+0000)
Subject: re PR fortran/31609 (module that calls a contained function with an ENTRY point)
X-Git-Tag: releases/gcc-4.3.0~3662
X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=6d023ec55bfca23f4fa692b1650e3ddeecf73cc1;p=gcc.git

re PR fortran/31609 (module that calls a contained function with an ENTRY point)

2007-07-28  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/31609
	* resolve.c (generic_sym): Check for a same symbol and if so, return to
	avoid infinite recursion.

From-SVN: r127026
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6f037174a3c5..9a345b34a9ba 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-28  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/31609
+	* resolve.c (generic_sym): Check for a same symbol and if so, return to
+	avoid infinite recursion.
+
 2007-07-28  Daniel Franke  <franke.daniel@gmail.com>
 
 	PR fortran/31818
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index a7edd169105c..88980093d2da 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -789,8 +789,16 @@ generic_sym (gfc_symbol *sym)
     return 0;
 
   gfc_find_symbol (sym->name, sym->ns->parent, 1, &s);
+  
+  if (s != NULL)
+    {
+      if (s == sym)
+	return 0;
+      else
+	return generic_sym (s);
+    }
 
-  return (s == NULL) ? 0 : generic_sym (s);
+  return 0;
 }