From: janus <janus@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 28 Apr 2009 16:27:27 +0000 (+0000)
Subject: 2009-04-28  Janus Weil  <janus@gcc.gnu.org>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65a8cc66f901b3d3ca9ebaa6c1a620ce366257ed;p=thirdparty%2Fgcc.git

2009-04-28  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/39946
	* resolve.c (resolve_symbol): Correctly copy the interface of a
	PROCEDURE statement if the interface involves a RESULT variable.


2009-04-28  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/39946
	* gfortran.dg/proc_ptr_16.f90: New.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@146905 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6db33255619b..e60eca618d32 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-28  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/39946
+	* resolve.c (resolve_symbol): Correctly copy the interface of a
+	PROCEDURE statement if the interface involves a RESULT variable.
+
 2009-04-28  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/39930
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 750786991684..fe79e4a67039 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -9244,7 +9244,10 @@ resolve_symbol (gfc_symbol *sym)
 	  if (ifc->attr.intrinsic)
 	    resolve_intrinsic (ifc, &ifc->declared_at);
 
-	  sym->ts = ifc->ts;
+	  if (ifc->result)
+	    sym->ts = ifc->result->ts;
+	  else   
+	    sym->ts = ifc->ts;
 	  sym->ts.interface = ifc;
 	  sym->attr.function = ifc->attr.function;
 	  sym->attr.subroutine = ifc->attr.subroutine;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ebfcff932e94..024998b44698 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-28  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/39946
+	* gfortran.dg/proc_ptr_16.f90: New.
+
 2009-04-28  Steve Ellcey  <sje@cup.hp.com>
 
 	* testsuite/gcc.target/ia64/sync-1.c: Check for cmpxchg8 only if
diff --git a/gcc/testsuite/gfortran.dg/proc_ptr_16.f90 b/gcc/testsuite/gfortran.dg/proc_ptr_16.f90
new file mode 100644
index 000000000000..904b550b5e9e
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/proc_ptr_16.f90
@@ -0,0 +1,20 @@
+! { dg-do compile }
+!
+! PR 39946: PROCEDURE statements: interface with RESULT variable
+!
+! Original test case by Juergen Reuter <reuter@physik.uni-freiburg.de>
+! Modified by Janus Weil <janus@gcc.gnu.org>
+
+  procedure(prc_is_allowed), pointer :: fptr
+
+  interface
+     function prc_is_allowed (flv, hel, col) result (is_allowed)
+       logical :: is_allowed
+       integer, intent(in) :: flv, hel, col
+     end function prc_is_allowed
+  end interface
+
+  fptr => prc_is_allowed
+
+end
+