re PR fortran/40453 ([F95] Enhanced (recursive) argument checking)

2012-10-12  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/40453
	* interface.c (check_dummy_characteristics): Recursively check dummy
	procedures.

2012-10-12  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/40453
	* gfortran.dg/dummy_procedure_9.f90: New.

From-SVN: r192391

gcc/fortran/ChangeLog

+2012-10-12  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/40453
+	* interface.c (check_dummy_characteristics): Recursively check dummy
+	procedures.
+
 2012-10-11  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/54784

gcc/fortran/interface.c

@@ -1063,6 +1063,19 @@ check_dummy_characteristics (gfc_symbol *s1, gfc_symbol *s2,
   /* FIXME: Do more comprehensive testing of attributes, like e.g.
 	    ASYNCHRONOUS, CONTIGUOUS, VALUE, VOLATILE, etc.  */
 
+  /* Check interface of dummy procedures.  */
+  if (s1->attr.flavor == FL_PROCEDURE)
+    {
+      char err[200];
+      if (!gfc_compare_interfaces (s1, s2, s2->name, 0, 1, err, sizeof(err),
+				   NULL, NULL))
+	{
+	  snprintf (errmsg, err_len, "Interface mismatch in dummy procedure "
+		    "'%s': %s", s1->name, err);
+	  return FAILURE;
+	}
+    }
+
   /* Check string length.  */
   if (s1->ts.type == BT_CHARACTER
       && s1->ts.u.cl && s1->ts.u.cl->length

gcc/testsuite/ChangeLog

+2012-10-12  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/40453
+	* gfortran.dg/dummy_procedure_9.f90: New.
+
 2012-10-12  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/54894

gcc/testsuite/gfortran.dg/dummy_procedure_9.f90

+! { dg-do compile }
+!
+! PR 40453: [F95] Enhanced (recursive) argument checking
+!
+! Contributed by Tobias Burnus <burnus@gcc.gnu.org>
+
+program RecursiveInterface
+  
+  call c(b2)  ! { dg-error "Interface mismatch in dummy procedure" }
+
+ contains
+
+    subroutine a1(x)
+      real :: x
+    end subroutine
+
+    subroutine a2(i)
+      integer :: i
+    end subroutine
+
+    !!!!!!!!!!!!!!!
+
+    subroutine b1 (f1)
+      procedure(a1) :: f1
+    end subroutine
+
+    subroutine b2 (f2)
+      procedure(a2) :: f2
+    end subroutine
+
+    !!!!!!!!!!!!!!!
+
+    subroutine c(g)
+     procedure(b1) :: g
+    end subroutine
+  
+end