Patchwork [Fortran] PR53643 Fix INTENT(OUT) for class arrays

login
register
mail settings
Submitter Tobias Burnus
Date June 13, 2012, 7:54 a.m.
Message ID <4FD8474E.5090808@net-b.de>
Download mbox | patch
Permalink /patch/164559/
State New
Headers show

Comments

Tobias Burnus - June 13, 2012, 7:54 a.m.
gfortran had an ICE with intent(out) class arrays - and with 
(polymorphic) scalar coarrays.

Build and regtested on x86-64-linux.
OK for the trunk?

Tobias
Paul Richard Thomas - June 13, 2012, 11:50 a.m.
Dear Tobias,

I had earmarked this one to fix myself!  It's good for trunk.

Thanks

Paul

On 13 June 2012 09:54, Tobias Burnus <burnus@net-b.de> wrote:
> gfortran had an ICE with intent(out) class arrays - and with (polymorphic)
> scalar coarrays.
>
> Build and regtested on x86-64-linux.
> OK for the trunk?
>
> Tobias

Patch

2012-06-12  Tobias Burnus  <burnus@net-b.de>

	PR fortran/53643
	* trans-decl.c (init_intent_out_dt): Fix for polymorphic arrays.
	* trans-array.c (structure_alloc_comps): Don't loop for
	scalar coarrays.

2012-06-12  Tobias Burnus  <burnus@net-b.de>

	PR fortran/53643
	* gfortran.dg/intent_out_7.f90: New.

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 2534462..0e78210 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -7318,9 +7318,7 @@  structure_alloc_comps (gfc_symbol * der_type, tree decl,
 
   if ((POINTER_TYPE_P (decl_type) && rank != 0)
 	|| (TREE_CODE (decl_type) == REFERENCE_TYPE && rank == 0))
-
-    decl = build_fold_indirect_ref_loc (input_location,
-				    decl);
+    decl = build_fold_indirect_ref_loc (input_location, decl);
 
   /* Just in case in gets dereferenced.  */
   decl_type = TREE_TYPE (decl);
@@ -7328,7 +7326,7 @@  structure_alloc_comps (gfc_symbol * der_type, tree decl,
   /* If this an array of derived types with allocatable components
      build a loop and recursively call this function.  */
   if (TREE_CODE (decl_type) == ARRAY_TYPE
-	|| GFC_DESCRIPTOR_TYPE_P (decl_type))
+      || (GFC_DESCRIPTOR_TYPE_P (decl_type) && rank != 0))
     {
       tmp = gfc_conv_array_data (decl);
       var = build_fold_indirect_ref_loc (input_location,
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 637376b..75a2160 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -3451,12 +3451,9 @@  init_intent_out_dt (gfc_symbol * proc_sym, gfc_wrapped_block * block)
 	     && !CLASS_DATA (f->sym)->attr.class_pointer
 	     && CLASS_DATA (f->sym)->ts.u.derived->attr.alloc_comp)
       {
-	tree decl = build_fold_indirect_ref_loc (input_location,
-						 f->sym->backend_decl);
-	tmp = CLASS_DATA (f->sym)->backend_decl;
-	tmp = fold_build3_loc (input_location, COMPONENT_REF,
-			       TREE_TYPE (tmp), decl, tmp, NULL_TREE);
-	tmp = build_fold_indirect_ref_loc (input_location, tmp);
+	tmp = gfc_class_data_get (f->sym->backend_decl);
+	if (CLASS_DATA (f->sym)->as == NULL)
+	  tmp = build_fold_indirect_ref_loc (input_location, tmp);
 	tmp = gfc_deallocate_alloc_comp (CLASS_DATA (f->sym)->ts.u.derived,
 					 tmp,
 					 CLASS_DATA (f->sym)->as ?
--- /dev/null	2012-06-12 08:13:11.079779038 +0200
+++ gcc/gcc/testsuite/gfortran.dg/intent_out_7.f90	2012-06-13 09:45:19.000000000 +0200
@@ -0,0 +1,26 @@ 
+! { dg-do compile }
+! { dg-options "-fcoarray=single" }
+!
+! PR fortran/53643
+!
+type t
+ integer, allocatable :: comp
+end type t
+contains
+ subroutine foo(x,y)
+   class(t), allocatable, intent(out) :: x(:)
+   class(t), intent(out) :: y(:)
+ end subroutine
+ subroutine foo2(x,y)
+   class(t), allocatable, intent(out) :: x
+   class(t), intent(out) :: y
+ end subroutine
+ subroutine bar(x,y)
+   class(t), intent(out) :: x(:)[*]
+   class(t), intent(out) :: y[*]
+ end subroutine
+ subroutine bar2(x,y)
+   type(t), intent(out) :: x(:)[*]
+   type(t), intent(out) :: y[*]
+ end subroutine
+end