From: Tobias Burnus <burnus@net-b.de>
Date: Tue, 22 Apr 2014 19:28:43 +0000 (+0200)
Subject: re PR fortran/60881 (ICE on dummy argument that extends a type with scalar and scalar... 
X-Git-Tag: releases/gcc-5.1.0~7993
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1dc55ad71a5b75889e1675b01bfa13d494797eb;p=thirdparty%2Fgcc.git

re PR fortran/60881 (ICE on dummy argument that extends a type with scalar and scalar coarry components)

2014-04-22  Tobias Burnus  <burnus@net-b.de>

        PR fortran/60881
        * trans-expr.c (gfc_trans_subcomponent_assign): Fix handling
        of scalar coarrays.

2014-04-22  Tobias Burnus  <burnus@net-b.de>

        PR fortran/60881
        * coarray/alloc_comp_3.f90: New.

From-SVN: r209657
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d2b666040d09..427c9b15ad85 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-22  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/60881
+	* trans-expr.c (gfc_trans_subcomponent_assign): Fix handling
+	of scalar coarrays.
+
 2014-04-17  Jakub Jelinek  <jakub@redhat.com>
 
 	* trans-types.c (gfc_init_kinds): Make sure GET_MODE_BITSIZE
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 955102b042e1..d6f820c49158 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -5989,7 +5989,8 @@ gfc_trans_subcomponent_assign (tree dest, gfc_component * cm, gfc_expr * expr)
     {
       gfc_init_se (&se, NULL);
       /* Pointer component.  */
-      if (cm->attr.dimension && !cm->attr.proc_pointer)
+      if ((cm->attr.dimension || cm->attr.codimension)
+	  && !cm->attr.proc_pointer)
 	{
 	  /* Array pointer.  */
 	  if (expr->expr_type == EXPR_NULL)
@@ -6026,7 +6027,8 @@ gfc_trans_subcomponent_assign (tree dest, gfc_component * cm, gfc_expr * expr)
 					gfc_class_initializer (&cm->ts, expr));
       gfc_add_expr_to_block (&block, tmp);
     }
-  else if (cm->attr.dimension && !cm->attr.proc_pointer)
+  else if ((cm->attr.dimension || cm->attr.codimension)
+	   && !cm->attr.proc_pointer)
     {
       if (cm->attr.allocatable && expr->expr_type == EXPR_NULL)
  	gfc_conv_descriptor_data_set (&block, dest, null_pointer_node);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 357847004dfa..9d0ef96d93a2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-22  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/60881
+	* coarray/alloc_comp_3.f90: New.
+
 2014-04-22  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/60868
diff --git a/gcc/testsuite/gfortran.dg/coarray/alloc_comp_3.f90 b/gcc/testsuite/gfortran.dg/coarray/alloc_comp_3.f90
new file mode 100644
index 000000000000..cf2d54203287
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/coarray/alloc_comp_3.f90
@@ -0,0 +1,23 @@
+! { dg-do compile }
+!
+! PR fortran/60881
+!
+! Contributed by Damian Rouson
+!
+! Was ICEing before
+!
+program main
+  implicit none
+  type co_object
+    logical :: defined=.false.
+    real, allocatable :: dummy_to_facilitate_extension[:]
+  end type
+  type, extends(co_object) :: global_field
+  end type
+  type(global_field) T
+  call assign_local_field(T)
+contains
+  subroutine assign_local_field(lhs)
+    type(global_field) lhs
+  end subroutine
+end program