From: Janus Weil <janus@gcc.gnu.org>
Date: Sun, 13 Nov 2016 11:12:05 +0000 (+0100)
Subject: re PR fortran/60952 ([F03] Problem using "end" as a type-bound procedure and containe... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f9d49cd1d03747a338d40afdead14b80b5cd7df3;p=gcc.git

re PR fortran/60952 ([F03] Problem using "end" as a type-bound procedure and contained procedure)

2016-11-13  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/60952
	* decl.c (match_procedure_in_type): Apply the FL_PROCEDURE attribute
	to the target procedure.

2016-11-13  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/60952
	* gfortran.dg/typebound_proc_34.f90: New test.

From-SVN: r242352
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a9db062b4ab..b5324f255fa 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-13  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/60952
+	* decl.c (match_procedure_in_type): Apply the FL_PROCEDURE attribute
+	to the target procedure.
+
 2016-11-13  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/66366
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 4f5c0cfa4ac..21eaafe488f 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -9624,6 +9624,8 @@ match_procedure_in_type (void)
 			    false))
 	return MATCH_ERROR;
       gfc_set_sym_referenced (stree->n.tb->u.specific->n.sym);
+      gfc_add_flavor(&stree->n.tb->u.specific->n.sym->attr, FL_PROCEDURE,
+		     target, &stree->n.tb->u.specific->n.sym->declared_at);
 
       if (gfc_match_eos () == MATCH_YES)
 	return MATCH_YES;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 65fbaad34f9..99bb0d4baea 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-13  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/60952
+	* gfortran.dg/typebound_proc_34.f90: New test.
+
 2016-11-13  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/66366
diff --git a/gcc/testsuite/gfortran.dg/typebound_proc_34.f90 b/gcc/testsuite/gfortran.dg/typebound_proc_34.f90
new file mode 100644
index 00000000000..bf2b882bb7a
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/typebound_proc_34.f90
@@ -0,0 +1,26 @@
+! { dg-do compile }
+!
+! PR 60952: [F03] Problem using "end" as a type bound procedure and contained procedures
+!
+! Contributed by tlcclt <Thomas.L.Clune@nasa.gov>
+
+module A_mod
+  implicit none
+
+  type A
+  contains
+    procedure, nopass :: end
+  end type
+
+contains
+
+  subroutine swap
+  contains
+    subroutine subSwap
+    end subroutine
+  end subroutine
+
+  integer function end()
+  end function
+
+end module