diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2009-04-08 08:59:34 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2009-04-08 08:59:34 +0000 |
| commit | bafc96b4a4e2bd72884217f26bcd970942231adb (patch) | |
| tree | 59a5eb4e851c7cf27c6a926532ca20e710d5abcd /gcc | |
| parent | 8e481a2ca6dcab968cc8c18f0fdc6745e75b8afc (diff) | |
| download | gcc-bafc96b4a4e2bd72884217f26bcd970942231adb.zip gcc-bafc96b4a4e2bd72884217f26bcd970942231adb.tar.gz gcc-bafc96b4a4e2bd72884217f26bcd970942231adb.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/alloc_comp_result_1.f90 | 33 |
4 files changed, 46 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f9e8ce4..d078a21 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 151f2ca..a96a48d 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 a0fee86..1e1206e 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 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" } } |