diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2012-02-29 07:21:38 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2012-02-29 07:21:38 +0000 |
| commit | 5cda350e60df32b728d1cf4a346a980d5870193c (patch) | |
| tree | 6711111812b41f509f252bc2a50d75120d9584f4 /gcc | |
| parent | b7c8e77fbf781f7d4a773e3aec742c27582a63f8 (diff) | |
| download | gcc-5cda350e60df32b728d1cf4a346a980d5870193c.zip gcc-5cda350e60df32b728d1cf4a346a980d5870193c.tar.gz gcc-5cda350e60df32b728d1cf4a346a980d5870193c.tar.bz2 | |
re PR fortran/52386 (ICE in gfc_conv_descriptor_dtyp (realloc LHS related))
2012-02-29 Paul Thomas <pault@gcc.gnu.org>
PR fortran/52386
* trans-expr.c (fcncall_realloc_result): Dereference the
descriptor if needed.
2012-02-29 Paul Thomas <pault@gcc.gnu.org>
PR fortran/52386
* gfortran.dg/realloc_on_assign_13.f90 : New test.
From-SVN: r184651
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/realloc_on_assign_13.f90 | 20 |
4 files changed, 33 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index babf8b5..4867087 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2012-02-29 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/52386 + * trans-expr.c (fcncall_realloc_result): Dereference the + descriptor if needed. + 2012-02-22 Tobias Burnus <burnus@net-b.de> PR fortran/52335 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index ec21838..3552da3 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -6299,6 +6299,8 @@ fcncall_realloc_result (gfc_se *se, int rank) /* Use the allocation done by the library. Substitute the lhs descriptor with a copy, whose data field is nulled.*/ desc = build_fold_indirect_ref_loc (input_location, se->expr); + if (POINTER_TYPE_P (TREE_TYPE (desc))) + desc = build_fold_indirect_ref_loc (input_location, desc); /* Unallocated, the descriptor does not have a dtype. */ tmp = gfc_conv_descriptor_dtype (desc); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d835796..5ff3cd8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-02-29 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/52386 + * gfortran.dg/realloc_on_assign_13.f90 : New test. + 2012-02-28 Matthew Gretton-Dann <matthew.gretton-dann@arm.com> PR target/51534 diff --git a/gcc/testsuite/gfortran.dg/realloc_on_assign_13.f90 b/gcc/testsuite/gfortran.dg/realloc_on_assign_13.f90 new file mode 100644 index 0000000..9661d72 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/realloc_on_assign_13.f90 @@ -0,0 +1,20 @@ +! { dg-do compile } +! Test the fix for PR52386. +! +! Contributed by Juergen Reuter <reuter@physik.uni-freiburg.de> +! +module cascades + implicit none + private +contains + function reduced (array) + integer, dimension(:), allocatable :: reduced + integer, dimension(:), intent(in) :: array + logical, dimension(size(array)) :: mask + mask = .true. + allocate (reduced (count (mask))) + reduced = pack (array, mask) + end function reduced +end module cascades +! { dg-final { cleanup-modules "cascades" } } + |