2011-06-12 Tobias Burnus

        PR fortran/49324
        * trans-expr.c (gfc_trans_assignment_1): Tell
        gfc_trans_scalar_assign to also deep-copy RHS nonvariables
        with allocatable components.
        * trans-array.c (gfc_conv_expr_descriptor): Ditto.

2011-06-12  Tobias Burnus

        PR fortran/49324
        * gfortran.dg/alloc_comp_assign_11.f90: New.

From-SVN: r174959

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ac9f3cae1884d7fc1a2436e8a1dac85794df4069..ad06808d1392af69294710a8df7a6650dbf19e88 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-12  Tobias Burnus
+
+       PR fortran/49324
+       * trans-expr.c (gfc_trans_assignment_1): Tell
+       gfc_trans_scalar_assign to also deep-copy RHS nonvariables
+       with allocatable components.
+       * trans-array.c (gfc_conv_expr_descriptor): Ditto.
+
 2011-05-11  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        * frontend-passes.c (optimize_assignment): Follow chains

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index c7aeadb3c8bda3fe334d55e4357f0ba9bd638213..baf9060fe6ba245759870be44eeb07fc59641ab8 100644 (file)
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -5808,7 +5808,8 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss)
 
       lse.string_length = rse.string_length;
       tmp = gfc_trans_scalar_assign (&lse, &rse, expr->ts, true,
-                                    expr->expr_type == EXPR_VARIABLE, true);
+                                    expr->expr_type == EXPR_VARIABLE
+                                    || expr->expr_type == EXPR_ARRAY, true);
       gfc_add_expr_to_block (&block, tmp);
 
       /* Finish the copying loops.  */

diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index da4af1ae28d3a0f6e648878c665c0f6ddefc3cfd..7383265783836cc88fcc50e58f96ae956983be70 100644 (file)
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -6155,8 +6155,8 @@ gfc_trans_assignment_1 (gfc_expr * expr1, gfc_expr * expr2, bool init_flag,
 
   tmp = gfc_trans_scalar_assign (&lse, &rse, expr1->ts,
                                 l_is_temp || init_flag,
-                                expr_is_variable (expr2) || scalar_to_array,
-                                dealloc);
+                                expr_is_variable (expr2) || scalar_to_array
+                                || expr2->expr_type == EXPR_ARRAY, dealloc);
   gfc_add_expr_to_block (&body, tmp);
 
   if (lss == gfc_ss_terminator)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f34cf1933ff95bbe98fc359580834b8e90e1829c..1440c9be6bc8f2eeebd9262bb0ee2ef9b4c6d0c3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-12  Tobias Burnus
+
+       PR fortran/49324
+       * gfortran.dg/alloc_comp_assign_11.f90: New.
+
 2011-05-11  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        * gfortran.dg/trim_optimize_7.f90:  New test.

diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_assign_11.f90 b/gcc/testsuite/gfortran.dg/alloc_comp_assign_11.f90
new file mode 100644 (file)
index 0000000..2d2b85b
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/alloc_comp_assign_11.f90
@@ -0,0 +1,41 @@
+! { dg-do run }
+!
+! PR fortran/49324
+!
+! Check that with array constructors a deep copy is done
+!
+implicit none
+type t
+  integer, allocatable :: A(:)
+end type t
+
+type(t) :: x, y
+type(t), allocatable :: z(:), z2(:)
+
+allocate (x%A(2))
+allocate (y%A(1))
+x%A(:) = 11
+y%A(:) = 22
+
+allocate (z(2))
+
+z = [ x, y ]
+!print *, z(1)%a, z(2)%a, x%A, y%A
+if (any (z(1)%a /= 11) .or. z(2)%a(1) /= 22 .or. any (x%A /= 11)  &
+    .or. y%A(1) /= 22)  &
+  call abort()
+
+x%A(:) = 444
+y%A(:) = 555
+
+!print *, z(1)%a, z(2)%a, x%A, y%A
+if (any (z(1)%a /= 11) .or. z(2)%a(1) /= 22 .or. any (x%A /= 444)  &
+    .or. y%A(1) /= 555)  &
+  call abort()
+
+z(:) = [ x, y ]
+!print *, z(1)%a, z(2)%a, x%A, y%A
+if (any (z(1)%a /= 444) .or. z(2)%a(1) /= 555 .or. any (x%A /= 444)  &
+    .or. y%A(1) /= 555)  &
+  call abort()
+end