From: Steven G. Kargl <kargl@gcc.gnu.org>
Date: Mon, 19 Mar 2018 19:14:06 +0000 (+0000)
Subject: re PR fortran/65453 (ICE in build_function_decl, at fortran/trans-decl.c:2001)
X-Git-Tag: releases/gcc-6.5.0~436
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1047bde38413e3d04dbe9aa44559b3ad111d363f;p=thirdparty%2Fgcc.git

re PR fortran/65453 (ICE in build_function_decl, at fortran/trans-decl.c:2001)

2018-03-19  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/65453
	* decl.c (get_proc_name): Catch clash between a procedure statement
	and a contained subprogram

2018-03-19  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/65453
	* gfortran.dg/pr65453.f90: New test.

From-SVN: r258657
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 433d66b4ee16..b602174069a8 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-19  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/65453
+	* decl.c (get_proc_name): Catch clash between a procedure statement
+	and a contained subprogram
+
 2018-03-12  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/83939
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 29656284fbff..4000a0c76b6d 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -1171,6 +1171,12 @@ get_proc_name (const char *name, gfc_symbol **result, bool module_fcn_entry)
 	gfc_error_now ("Procedure %qs at %C is already defined at %L",
 		       name, &sym->declared_at);
 
+      if (sym->attr.external && sym->attr.procedure
+	  && gfc_current_state () == COMP_CONTAINS)
+	gfc_error_now ("Contained procedure %qs at %C clashes with "
+			"procedure defined at %L",
+		       name, &sym->declared_at);
+
       /* Trap a procedure with a name the same as interface in the
 	 encompassing scope.  */
       if (sym->attr.generic != 0
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d29d0a61c4e4..2f58b0ffaf0c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-19  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/65453
+	* gfortran.dg/pr65453.f90: New test.
+
 2018-03-12  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/83939
diff --git a/gcc/testsuite/gfortran.dg/pr65453.f90 b/gcc/testsuite/gfortran.dg/pr65453.f90
new file mode 100644
index 000000000000..8d30116b79d0
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr65453.f90
@@ -0,0 +1,8 @@
+! { dg-do compile }
+! PR fortran/65453
+! Contributed by Tobias Burnus  <burnus at gcc.gnu.org>
+procedure() :: foo   ! { dg-error "(1)" }
+  contains
+    subroutine foo() ! { dg-error "clashes with procedure" }
+    end
+end