[multiple changes]

2005-11-30  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/15809
	* trans-decl.c (gfc_get_symbol_decl):  In the case of automatic
	character length, dummy pointer arrays, build an expression for
	unit size of the array elements, to be picked up and used in the
	descriptor dtype.
	* trans-io.c (gfc_trans_transfer):  Modify the detection of
	components of derived type arrays to use the gfc_expr references
	instead of the array descriptor dtype.  This allows the latter
	to contain expressions.

2005-11-30  Erik Edelmann  <erik.edelmann@iki.fi>

	PR fortran/15809
	* trans-array.c (gfc_trans_deferred_array):  Allow PARM_DECLs past
	in addition to VAR_DECLs.

2005-11-30  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/15809
	*  gfortran.dg/auto_char_dummy_array.f90: New test.

From-SVN: r107727

1 files changed, 16 insertions, 24 deletions

diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c
index 720ff58..98c1d1f 100644
--- a/gcc/fortran/trans-io.c
+++ b/gcc/fortran/trans-io.c
@@ -1768,6 +1768,7 @@ gfc_trans_transfer (gfc_code * code)
   stmtblock_t block, body;
   gfc_loopinfo loop;
   gfc_expr *expr;
+  gfc_ref *ref;
   gfc_ss *ss;
   gfc_se se;
   tree tmp;
@@ -1778,6 +1779,7 @@ gfc_trans_transfer (gfc_code * code)
   expr = code->expr;
   ss = gfc_walk_expr (expr);
 
+  ref = NULL;
   gfc_init_se (&se, NULL);
 
   if (ss == gfc_ss_terminator)
@@ -1788,33 +1790,23 @@ gfc_trans_transfer (gfc_code * code)
     }
   else
     {
-      /* Transfer an array. There are 3 options:
-      1) An array of an intrinsic type. This is handled by transfering
-	 the descriptor to the library.
-      2) A derived type containing an array. Scalarized by the frontend.
-      3) An array of derived type. Scalarized by the frontend.
-      */
-      if (expr->ts.type != BT_DERIVED)
+      /* Transfer an array. If it is an array of an intrinsic
+	 type, pass the descriptor to the library.  Otherwise
+	 scalarize the transfer.  */
+      if (expr->ref)
+	{
+	  for (ref = expr->ref; ref && ref->type != REF_ARRAY;
+		 ref = ref->next);
+	  gcc_assert (ref->type == REF_ARRAY);
+	}
+
+      if (expr->ts.type != BT_DERIVED && ref && ref->next == NULL)
 	{
 	  /* Get the descriptor.  */
 	  gfc_conv_expr_descriptor (&se, expr, ss);
-	  /* If it's not an array of derived type, transfer the array
-	     descriptor to the library.  */
-	  tmp = gfc_get_dtype (TREE_TYPE (se.expr));
-	  if (((TREE_INT_CST_LOW (tmp) & GFC_DTYPE_TYPE_MASK) 
-	       >> GFC_DTYPE_TYPE_SHIFT) != GFC_DTYPE_DERIVED)
-	    {
-	      tmp = gfc_build_addr_expr (NULL, se.expr);
-	      transfer_array_desc (&se, &expr->ts, tmp);
-	      goto finish_block_label;
-	    }
-	  else
-	    {
-	      /* Cleanup the mess getting the descriptor caused.  */
-	      expr = code->expr;
-	      ss = gfc_walk_expr (expr);
-	      gfc_init_se (&se, NULL);
-	    }
+	  tmp = gfc_build_addr_expr (NULL, se.expr);
+	  transfer_array_desc (&se, &expr->ts, tmp);
+	  goto finish_block_label;
 	}
       
       /* Initialize the scalarizer.  */