[multiple changes]

2016-01-23  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/69397
	PR fortran/68442
	* interface.c (gfc_arglist_matches_symbol): Replace assert with
	a return false if not a procedure.
	* resolve.c (resolve_generic_f): Test if we are resolving an
	initialization expression and adjust error message accordingly.

2016-01-24  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/69397
	PR fortran/68442
	* gfortran.dg/interface_38.f90: New test.
	* gfortran.dg/interface_39.f90: New test.

From-SVN: r232780

gcc/fortran/ChangeLog

+2016-01-23  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/69397
+	PR fortran/68442
+	* interface.c (gfc_arglist_matches_symbol): Replace assert with
+	a return false if not a procedure.
+	* resolve.c (resolve_generic_f): Test if we are resolving an
+	initialization expression and adjust error message accordingly.
+
 2016-01-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/66094

gcc/fortran/interface.c

@@ -3506,7 +3506,8 @@ gfc_arglist_matches_symbol (gfc_actual_arglist** args, gfc_symbol* sym)
   gfc_formal_arglist *dummy_args;
   bool r;
 
-  gcc_assert (sym->attr.flavor == FL_PROCEDURE);
+  if (sym->attr.flavor != FL_PROCEDURE)
+    return false;
 
   dummy_args = gfc_sym_get_dummy_args (sym);
 

gcc/fortran/resolve.c

@@ -2565,6 +2565,11 @@ generic:
      that possesses a matching interface.  14.1.2.4  */
   if (sym  && !intr && !gfc_is_intrinsic (sym, 0, expr->where))
     {
+      if (gfc_init_expr_flag)
+	gfc_error ("Function %qs in initialization expression at %L "
+		   "must be an intrinsic function",
+		   expr->symtree->n.sym->name, &expr->where);
+      else
 	gfc_error ("There is no specific function for the generic %qs "
 		   "at %L", expr->symtree->n.sym->name, &expr->where);
       return false;

gcc/testsuite/ChangeLog

+2016-01-24  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/69397
+	PR fortran/68442
+	* gfortran.dg/interface_38.f90: New test.
+	* gfortran.dg/interface_39.f90: New test.
+	
 2016-01-24  Patrick Palka  <ppalka@gcc.gnu.org>
 
 	Revert:

gcc/testsuite/gfortran.dg/interface_38.f90

+! { dg-do compile }
+! PR69397
+program p
+   interface f
+      procedure f1 ! { dg-error "neither function nor subroutine" }
+      !... more
+   end interface
+   integer, allocatable :: z
+   print *, f(z) ! { dg-error "no specific function" }
+contains
+   integer function f2 (x)
+      integer, allocatable :: x
+      f2 = 1
+   end
+end
+

gcc/testsuite/gfortran.dg/interface_39.f90

+! { dg-do compile }
+! PR68442
+module m
+   interface gkind
+      procedure g
+   end interface
+contains
+   subroutine f(x)
+      character(kind=gkind()) :: x ! { dg-error "must be an intrinsic" }
+   end
+   integer function g()
+      g = 1
+   end
+end