re PR fortran/40848 (ICE with alternate returns)

2009-07-27  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/40848
	* interface.c (gfc_compare_interfaces): Call 'count_types_test' before
	'generic_correspondence', and only if checking a generic interface.


2009-07-27  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/40848
	* gfortran.dg/altreturn_7.f90: New.

From-SVN: r150134

gcc/fortran/ChangeLog

+2009-07-27  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/40848
+	* interface.c (gfc_compare_interfaces): Call 'count_types_test' before
+	'generic_correspondence', and only if checking a generic interface.
+
 2009-07-27  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/40851

gcc/fortran/interface.c

@@ -983,6 +983,8 @@ gfc_compare_interfaces (gfc_symbol *s1, gfc_symbol *s2, int generic_flag,
 
   if (generic_flag)
     {
+      if (count_types_test (f1, f2) || count_types_test (f2, f1))
+	return 0;
       if (generic_correspondence (f1, f2) || generic_correspondence (f2, f1))
 	return 0;
     }
@@ -1034,13 +1036,6 @@ gfc_compare_interfaces (gfc_symbol *s1, gfc_symbol *s2, int generic_flag,
 	f2 = f2->next;
       }
 
-  if (count_types_test (f1, f2) || count_types_test (f2, f1))
-    {
-      if (errmsg != NULL)
-	snprintf (errmsg, err_len, "Interface not matching");
-      return 0;
-    }
-
   return 1;
 }
 

gcc/testsuite/ChangeLog

+2009-07-27  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/40848
+	* gfortran.dg/altreturn_7.f90: New.
+
 2009-07-27  Simon Baldwin  <simonb@google.com>
 
 	PR testsuite/40829

gcc/testsuite/gfortran.dg/altreturn_7.f90

+! { dg-do compile }
+!
+! PR 40848: [4.5 Regression] ICE with alternate returns
+!
+! Contributed by Joost VandeVondele <jv244@cam.ac.uk>
+
+MODULE TT
+
+INTERFACE M
+ MODULE PROCEDURE M1,M2
+END INTERFACE
+
+CONTAINS
+
+ SUBROUTINE M1(I,*)
+   INTEGER :: I
+   RETURN 1
+ END SUBROUTINE
+
+ SUBROUTINE M2(I,J)
+   INTEGER :: I,J
+ END SUBROUTINE
+
+END MODULE
+
+
+  USE TT
+  CALL M(1,*2)
+  CALL ABORT()
+2 CONTINUE
+END
+
+! { dg-final { cleanup-modules "tt" } }
+