Re: [Fortran-Dev] Merge trunk into the branch

[Tobias Burnus <burnus at net-b dot de>]

Ciao Angelo,

Angelo Graziosi wrote:
> > I updated the branch to the trunk. Committed as 199612.
> trying to bootstrap it on Cygwin, it fails in this way
> /work/gcc-dev-r199612/gcc/fortran/trans-array.c:5104:22: error: 
> redefinition of âgfc_typespec* tsâ
>         gfc_typespec *ts)

Somehow, one merge problem has falling between the cracks. Fixed by the 
attached patch.

Regarding the Fortran-dev branch: I cannot recommend the branch for 
regular use, yet. There are still some issues (e.g. about 6 test suite 
failures). On the other hand, for testing it is stable enough.

Tobias

Index: gcc/fortran/ChangeLog.fortran-dev
===================================================================
--- gcc/fortran/ChangeLog.fortran-dev	(Revision 199687)
+++ gcc/fortran/ChangeLog.fortran-dev	(Arbeitskopie)
@@ -1,3 +1,9 @@
+2013-06-05  Tobias Burnus  <burnus@net-b.de>
+
+	* trans-array.c (gfc_array_init_size): Remove superfluous
+	"ts" argument due to trunk merging.
+	(gfc_array_allocate): Pass only one ts.
+
 2013-05-07  Tobias Burnus  <burnus@net-b.de>
 
 	* trans-intrinsic.c (gfc_conv_intrinsic_bound,
Index: gcc/fortran/trans-array.c
===================================================================
--- gcc/fortran/trans-array.c	(Revision 199687)
+++ gcc/fortran/trans-array.c	(Arbeitskopie)
@@ -5100,8 +5100,7 @@ gfc_array_init_size (tree descriptor, gfc_typespec
 		     int rank, int corank, tree * poffset,
 		     gfc_expr ** lower, gfc_expr ** upper, stmtblock_t * pblock,
 		     stmtblock_t * descriptor_block, tree * overflow,
-		     tree expr3_elem_size, tree *nelems, gfc_expr *expr3,
-		     gfc_typespec *ts)
+		     tree expr3_elem_size, tree *nelems, gfc_expr *expr3)
 {
   tree type;
   tree tmp;
@@ -5438,10 +5437,12 @@ gfc_array_allocate (gfc_se * se, gfc_expr * expr,
   overflow = integer_zero_node;
 
   gfc_init_block (&set_descriptor_block);
-  size = gfc_array_init_size (se->expr, &expr->ts, ref->u.ar.as->rank,
+  size = gfc_array_init_size (se->expr,
+			      ts->type != BT_UNKNOWN ? ts : &expr->ts,
+			      ref->u.ar.as->rank,
 			      ref->u.ar.as->corank, &offset, lower, upper,
 			      &se->pre, &set_descriptor_block, &overflow,
-			      expr3_elem_size, nelems, expr3, ts);
+			      expr3_elem_size, nelems, expr3);
 
   if (dimension)
     {