From 33c330b13ab7a4db3005eea671aeb80442304b10 Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Sat, 26 Sep 2015 20:34:39 +0000 Subject: [PATCH] Fix missing deep copy when assigning a DT constructor to an array This adds the missing deep copy when assiging a constructor of a derived type with allocatable components to an array. The check for constantness is removed so that the deep_copy argument passed to gfc_trans_scalar_assign is set to true. PR fortran/67721 gcc/fortran/ * trans-expr.c (gfc_trans_assignment_1): Remove the non-constantness condition guarding deep copy. gcc/testsuite/ * gfortran.dg/alloc_comp_deep_copy_3.f03: New. From-SVN: r228170 --- gcc/fortran/ChangeLog | 6 ++++ gcc/fortran/trans-expr.c | 1 - gcc/testsuite/ChangeLog | 5 ++++ .../gfortran.dg/alloc_comp_deep_copy_3.f03 | 30 +++++++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/alloc_comp_deep_copy_3.f03 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 7d303e5a4c4..6901ade45d3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2015-09-26 Mikael Morin + + PR fortran/67721 + * trans-expr.c (gfc_trans_assignment_1): Remove the non-constantness + condition guarding deep copy. + 2013-09-26 Paul Thomas PR fortran/67567 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index cfa1a71fc8d..e086fe3a103 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -9232,7 +9232,6 @@ gfc_trans_assignment_1 (gfc_expr * expr1, gfc_expr * expr2, bool init_flag, scalar_to_array = (expr2->ts.type == BT_DERIVED && expr2->ts.u.derived->attr.alloc_comp && !expr_is_variable (expr2) - && !gfc_is_constant_expr (expr2) && expr1->rank && !expr2->rank); scalar_to_array |= (expr1->ts.type == BT_DERIVED && expr1->rank diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 167e2e02dde..5c53e7e7091 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-09-26 Mikael Morin + + PR fortran/67721 + * gfortran.dg/alloc_comp_deep_copy_3.f03: New. + 2015-09-26 David Edelsohn * gcc.dg/pr64935-1.c: XFAIL on AIX. diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_deep_copy_3.f03 b/gcc/testsuite/gfortran.dg/alloc_comp_deep_copy_3.f03 new file mode 100644 index 00000000000..7032eaf8f3a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/alloc_comp_deep_copy_3.f03 @@ -0,0 +1,30 @@ +! { dg-do run } +! +! PR fortran/67721 +! Check that scalar to array assignments of derived type constructor +! deep copy the value when there are allocatable components. + +program p + implicit none + + type :: t1 + integer :: c1 + end type t1 + type :: t2 + type(t1), allocatable :: c2 + end type t2 + + block + type(t2) :: v(4) + + v = t2(t1(3)) + v(2)%c2%c1 = 7 + v(3)%c2%c1 = 11 + v(4)%c2%c1 = 13 + + if (v(1)%c2%c1 /= 3) call abort + if (v(2)%c2%c1 /= 7) call abort + if (v(3)%c2%c1 /= 11) call abort + if (v(4)%c2%c1 /= 13) call abort + end block +end program p -- 2.30.2