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

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 f9e8ce4ac1ee604846f5be15b22390121c4a2e5e..d078a21255bb1661318ad20e068a4719a8cf8702 100644 (file)
--- 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 151f2cab40de1514f2aa39a64447cd98ebc624ed..a96a48da2b76f7873f33cfc67f3f2f472992b7f4 100644 (file)
--- 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 a0fee86c2fa898828c73ce894ad2cf6a0d0c6bda..1e1206e537931d2912251eb1c2442587a60a2b8c 100644 (file)
--- 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 (file)
index 0000000..90f6d97
--- /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" } }