From: Paul Thomas <pault@gcc.gnu.org>
Date: Wed, 8 Apr 2009 08:59:34 +0000 (+0000)
Subject: re PR fortran/38863 (WHERE with multiple elemental defined assignments gives wrong... 
X-Git-Tag: releases/gcc-4.5.0~6811
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bafc96b4a4e2bd72884217f26bcd970942231adb;p=thirdparty%2Fgcc.git

re PR fortran/38863 (WHERE with multiple elemental defined assignments gives wrong answer)

2009-04-08  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/38863
	* trans-array.c (gfc_trans_deferred_array): Return if this
	is a result variable.

2009-04-08  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/38863
	* gfortran.dg/alloc_comp_result_1.f90: New test.

From-SVN: r145714
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f9e8ce4ac1ee..d078a21255bb 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-08  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/38863
+	* trans-array.c (gfc_trans_deferred_array): Return if this
+	is a result variable.
+
 2009-04-07  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/38152
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 151f2cab40de..a96a48da2b76 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -5825,8 +5825,8 @@ gfc_trans_deferred_array (gfc_symbol * sym, tree body)
       gfc_trans_vla_type_sizes (sym, &fnblock);
     }
 
-  /* Dummy and use associated variables don't need anything special.  */
-  if (sym->attr.dummy || sym->attr.use_assoc)
+  /* Dummy, use associated and result variables don't need anything special.  */
+  if (sym->attr.dummy || sym->attr.use_assoc || sym->attr.result)
     {
       gfc_add_expr_to_block (&fnblock, body);
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a0fee86c2fa8..1e1206e53793 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-08  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/38863
+	* gfortran.dg/alloc_comp_result_1.f90: New test.
+
 2009-04-07  Jason Merrill  <jason@redhat.com>
 
 	PR c++/34691
diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_result_1.f90 b/gcc/testsuite/gfortran.dg/alloc_comp_result_1.f90
new file mode 100644
index 000000000000..90f6d97fdf96
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/alloc_comp_result_1.f90
@@ -0,0 +1,33 @@
+! { dg-do run }
+! Test the fix for PR38802, in which the nulling of the result 'p'
+! in 'a_fun' would cause a segfault.
+!
+! Posted on the gfortran list by Marco Restelli http://gcc.gnu.org/ml/fortran/2009-01/
+
+!
+module mod_a
+  implicit none
+  public :: a_fun, t_1, t_2
+  private
+  type t_1
+    real :: coeff
+  end type t_1
+  type t_2
+    type(t_1), allocatable :: mons(:)
+  end type t_2
+contains
+  function a_fun(r) result(p)
+    integer, intent(in) :: r
+    type(t_2) :: p(r+1)
+    p = t_2 ([t_1 (99)])
+  end function a_fun
+end module mod_a
+
+program test
+  use mod_a, only: a_fun, t_1, t_2
+  implicit none
+  type(t_2) x(1)
+  x = a_fun(0)
+  if (any (x(1)%mons%coeff .ne. 99)) call abort
+end program test
+! { dg-final { cleanup-modules "mod_a" } }