re PR fortran/89200 (Erroneous copying of a derived type with a deferred-length chara...

2019-02-09  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/89200
	* trans-array.c (gfc_trans_create_temp_array): Set the 'span'
	field for derived types.

2019-02-09  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/89200
	* gfortran.dg/array_reference_2.f90 : New test.

From-SVN: r268721

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 03278652e110a2399cb730b17b6691a06c6f0525..96cb70e51a99d678d74a53aed496a26642cf1cce 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-02-09  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/89200
+       * trans-array.c (gfc_trans_create_temp_array): Set the 'span'
+       field for derived types.
+
 2019-02-04  Harald Anlauf  <anlauf@gmx.de>
 
        PR fortran/89077

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 2527950aacbde31aea94a03d9f9e685a8ec6353f..f15d3a379378a6c1c80cf3c0e0430285931d1c21 100644 (file)
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -1293,6 +1293,15 @@ gfc_trans_create_temp_array (stmtblock_t * pre, stmtblock_t * post, gfc_ss * ss,
   tmp = gfc_conv_descriptor_dtype (desc);
   gfc_add_modify (pre, tmp, gfc_get_dtype (TREE_TYPE (desc)));
 
+  /* Also set the span for derived types, since they can be used in
+     component references to arrays of this type.  */
+  if (TREE_CODE (eltype) == RECORD_TYPE)
+    {
+      tmp = TYPE_SIZE_UNIT (eltype);
+      tmp = fold_convert (gfc_array_index_type, tmp);
+      gfc_conv_descriptor_span_set (pre, desc, tmp);
+    }
+
   /*
      Fill in the bounds and stride.  This is a packed array, so:
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dd887d35378deee9aab495d095b09551ccd5385d..d9b9ccbfcceea7417c532fa3f13e2d335a716b9d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-09  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/89200
+       * gfortran.dg/array_reference_2.f90 : New test.
+
 2019-02-09  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/89246

diff --git a/gcc/testsuite/gfortran.dg/array_reference_2.f90 b/gcc/testsuite/gfortran.dg/array_reference_2.f90
new file mode 100644 (file)
index 0000000..6ec65eb
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/array_reference_2.f90
@@ -0,0 +1,20 @@
+! { dg-do run }
+!
+! Test the fix for PR89200, in which the indexing did not work in
+! the write statement below.
+!
+! Contributed by Damian Rouson  <damian@sourceryinstitute.org>
+!
+  type foo
+    character(len=:), allocatable :: string
+  end type
+  type foo_list
+    type(foo), allocatable :: entry(:)
+  end type
+  type(foo_list) list
+  character(4) :: buffer
+  list = foo_list([foo('12'), foo('34')])
+  write(buffer, '(2a2)') list%entry(1)%string, list%entry(2)%string
+  if (buffer .ne. '1234') stop 1
+  deallocate (list%entry)
+end