OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/45081 (ICE in gfc_conv_array_initializer, at fortran/trans-array.c:4208)

Browse Source 
2010-09-20  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/45081
	* simplify.c (is_constant_array_expr): Allow structure array
	elements as well as constants.
	(gfc_simplify_pack, gfc_simplify_reshape, gfc_simplify_spread,
	gfc_simplify_transpose, gfc_simplify_unpack): Copy the derived
	type of source to the result.

2010-09-20  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/45081
	* gfortran.dg/derived_array_intrinsics_1.f90 : New test.

From-SVN: r164448
This commit is contained in:
Paul Thomas 2010-09-20 18:55:12 +00:00
parent abc88a0827
commit 15c2ef5ad3
4 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/fortran/ChangeLog
View File

@ -1,3 +1,12 @@
2010-09-20 Paul Thomas <pault@gcc.gnu.org>
PR fortran/45081
* simplify.c (is_constant_array_expr): Allow structure array
elements as well as constants.
(gfc_simplify_pack, gfc_simplify_reshape, gfc_simplify_spread,
gfc_simplify_transpose, gfc_simplify_unpack): Copy the derived
type of source to the result.
2010-09-19 Thomas Koenig <tkoenig@gcc.gnu.org>
* frontend-passes.c (gfc_expr_walker): Also

15
gcc/fortran/simplify.c
View File

@ -235,7 +235,8 @@ is_constant_array_expr (gfc_expr *e)
for (c = gfc_constructor_first (e->value.constructor);
c; c = gfc_constructor_next (c))
if (c->expr->expr_type != EXPR_CONSTANT)
if (c->expr->expr_type != EXPR_CONSTANT
&& c->expr->expr_type != EXPR_STRUCTURE)
return false;
return true;
@ -4550,6 +4551,8 @@ gfc_simplify_pack (gfc_expr *array, gfc_expr *mask, gfc_expr *vector)
return NULL;
result = gfc_get_array_expr (array->ts.type, array->ts.kind, &array->where);
if (array->ts.type == BT_DERIVED)
result->ts.u.derived = array->ts.u.derived;
array_ctor = gfc_constructor_first (array->value.constructor);
vector_ctor = vector
@ -4982,6 +4985,8 @@ gfc_simplify_reshape (gfc_expr *source, gfc_expr *shape_exp,
result = gfc_get_array_expr (source->ts.type, source->ts.kind,
&source->where);
if (source->ts.type == BT_DERIVED)
result->ts.u.derived = source->ts.u.derived;
result->rank = rank;
result->shape = gfc_get_shape (rank);
for (i = 0; i < rank; i++)
@ -5732,6 +5737,8 @@ gfc_simplify_spread (gfc_expr *source, gfc_expr *dim_expr, gfc_expr *ncopies_exp
result = gfc_get_array_expr (source->ts.type, source->ts.kind,
&source->where);
if (source->ts.type == BT_DERIVED)
result->ts.u.derived = source->ts.u.derived;
result->rank = 1;
result->shape = gfc_get_shape (result->rank);
mpz_init_set_si (result->shape[0], ncopies);
@ -5750,6 +5757,8 @@ gfc_simplify_spread (gfc_expr *source, gfc_expr *dim_expr, gfc_expr *ncopies_exp
result = gfc_get_array_expr (source->ts.type, source->ts.kind,
&source->where);
if (source->ts.type == BT_DERIVED)
result->ts.u.derived = source->ts.u.derived;
result->rank = source->rank + 1;
result->shape = gfc_get_shape (result->rank);
@ -6038,6 +6047,8 @@ gfc_simplify_transpose (gfc_expr *matrix)
if (matrix->ts.type == BT_CHARACTER)
result->ts.u.cl = matrix->ts.u.cl;
else if (matrix->ts.type == BT_DERIVED)
result->ts.u.derived = matrix->ts.u.derived;
matrix_rows = mpz_get_si (matrix->shape[0]);
matrix_cols = mpz_get_si (matrix->shape[1]);
@ -6341,6 +6352,8 @@ gfc_simplify_unpack (gfc_expr *vector, gfc_expr *mask, gfc_expr *field)
result = gfc_get_array_expr (vector->ts.type, vector->ts.kind,
&vector->where);
if (vector->ts.type == BT_DERIVED)
result->ts.u.derived = vector->ts.u.derived;
result->rank = mask->rank;
result->shape = gfc_copy_shape (mask->shape, mask->rank);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2010-09-20 Paul Thomas <pault@gcc.gnu.org>
PR fortran/45081
* gfortran.dg/derived_array_intrinsics_1.f90 : New test.
2010-09-20 H.J. Lu <hongjiu.lu@intel.com>
* g++.dg/tree-ssa/pr45605.C: Add "\\".

30
gcc/testsuite/gfortran.dg/derived_array_intrinisics_1.f90 Normal file
View File

@ -0,0 +1,30 @@
! { dg-do compile }
! { dg-options "-fdump-tree-original" }
! Test the fix for PR45081 in which derived type array valued intrinsics failed
! to simplify, which caused an ICE in trans-array.c
!
! Contributed by Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
!
module m
implicit none
integer :: i
type t
integer :: i
end type t
type(t), dimension(4), parameter :: t1 = [( t(i), i = 1, 4)]
type(t), dimension(4), parameter :: t2 = [( t(i), i = 8, 11)]
type(t), dimension(2,2), parameter :: a = reshape ( t1, [ 2, 2 ] )
type(t), dimension(2,2), parameter :: b = transpose (a)
type(t), dimension(4), parameter :: c = reshape ( b, [ 4 ] )
type(t), dimension(2), parameter :: d = pack ( c, [.false.,.true.,.false.,.true.])
type(t), dimension(4), parameter :: e = unpack (d, [.false.,.true.,.false.,.true.], t2)
type(t), dimension(4,2), parameter :: f = spread (e, 2, 2)
type(t), dimension(8), parameter :: g = reshape ( f, [ 8 ] )
integer, parameter :: total = sum(g%i)
end module m
use m
integer :: j
j = total
end
! { dg-final { scan-tree-dump-times "j = 50" 1 "original" } }