re PR fortran/31320 (Illegal read with gfortran.dg/alloc_comp_assign_2.f90 and *_3.f90)

2007-07-17  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/31320
	PR fortran/32665
	* trans-expr.c (gfc_trans_subcomponent_assign): Ensure that
	renormalization unity base is done independently of existing
	lbound value.
	(gfc_trans_scalar_assign): If rhs is not a variable, put
	lse->pre after rse->pre to ensure that de-allocation of lhs
	occurs after evaluation of rhs.

2007-07-17  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/31320
	PR fortran/32665
	* gfortran.dg/alloc_comp_constructor_3.f90: New test.

From-SVN: r126703

gcc/fortran/ChangeLog

+2007-07-17  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/31320
+	PR fortran/32665
+	* trans-expr.c (gfc_trans_subcomponent_assign): Ensure that
+	renormalization unity base is done independently of existing
+	lbound value.
+	(gfc_trans_scalar_assign): If rhs is not a variable, put
+	lse->pre after rse->pre to ensure that de-allocation of lhs
+	occurs after evaluation of rhs.
+
 2007-07-16  Lee Millward  <lee.millward@gmail.com>
 
 	PR fortran/32222

gcc/fortran/trans-expr.c

@@ -3009,11 +3009,14 @@ gfc_trans_subcomponent_assign (tree dest, gfc_component * cm, gfc_expr * expr)
 	      if (expr->expr_type != EXPR_VARIABLE
 		    && expr->expr_type != EXPR_CONSTANT)
 		{
+		  tree span;
 		  tmp = gfc_conv_descriptor_ubound (dest, gfc_rank_cst[n]);
+		  span = fold_build2 (MINUS_EXPR, gfc_array_index_type, tmp,
+			    gfc_conv_descriptor_lbound (dest, gfc_rank_cst[n]));
 		  gfc_add_modify_expr (&block, tmp,
 				       fold_build2 (PLUS_EXPR,
 						    gfc_array_index_type,
-                                                    tmp, gfc_index_one_node));
+						    span, gfc_index_one_node));
 		  tmp = gfc_conv_descriptor_lbound (dest, gfc_rank_cst[n]);
 		  gfc_add_modify_expr (&block, tmp, gfc_index_one_node);
 		}
@@ -3498,8 +3501,16 @@ gfc_trans_scalar_assign (gfc_se * lse, gfc_se * rse, gfc_typespec ts,
 	  gfc_add_expr_to_block (&lse->pre, tmp);
 	}
 
+      if (r_is_var)
+	{
 	  gfc_add_block_to_block (&block, &lse->pre);
 	  gfc_add_block_to_block (&block, &rse->pre);
+	}
+      else
+	{
+	  gfc_add_block_to_block (&block, &rse->pre);
+	  gfc_add_block_to_block (&block, &lse->pre);
+	}
 
       gfc_add_modify_expr (&block, lse->expr,
 			   fold_convert (TREE_TYPE (lse->expr), rse->expr));

gcc/testsuite/ChangeLog

+2007-07-17  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/31320
+	PR fortran/32665
+	* gfortran.dg/alloc_comp_constructor_3.f90: New test.
+
 2007-07-17  Zdenek Dvorak  <dvorakz@suse.cz>
 
 	PR rtl-optimization/32773

gcc/testsuite/gfortran.dg/alloc_comp_constructor_3.f90

+! { dg-do run }
+! Tests the fix for PR32665 in which the structure initializer at line
+! 13 was getting the array length wrong by one and in which the automatic
+! deallocation of a in 14 was occurring before the evaluation of the rhs.
+!
+! Contributed by Daniel Franke <dfranke@gcc.gnu.org>
+!
+  TYPE :: x
+    INTEGER, ALLOCATABLE :: a(:)
+  END TYPE
+  TYPE(x) :: a
+
+  a = x ((/ 1, 2, 3 /))                             ! This is also pr31320.
+  a = x ((/ a%a, 4 /))
+  if (any (a%a .ne. (/1,2,3,4/))) call abort ()
+end