Hello world,
the attached patch fixes the PR by simpliy having gfc_simplify_spread
also do its job when there's an EXPR_STRUCTURE. The code to correctly
handle that case was already in place, it just was not run for that
case.
Regression-tested. OK for trunk?
Regards
Thomas
! { dg-do run }
! PR 68426 - simplification used to fail.
module m
implicit none
type t
integer :: i
end type t
type(t), dimension(2), parameter :: a1 = (/ t(1), t(2) /)
type(t), dimension(1), parameter :: c = spread ( a1(1), 1, 1 )
end module m
ig25@flaemmli:~/Krempel/Spread> cat ChangeLog
2019-01-09 Thomas Koenig <[email protected]>
PR fortran/68426
* simplify.c (gfc_simplify_spread): Also simplify if the
type of source is an EXPR_STRUCTURE.
2019-01-09 Thomas Koenig <[email protected]>
PR fortran/68426
* gfortran.dg/spread_simplify_1.f90: New test.
Index: simplify.c
===================================================================
--- simplify.c (Revision 267737)
+++ simplify.c (Arbeitskopie)
@@ -7572,7 +7572,8 @@ gfc_simplify_spread (gfc_expr *source, gfc_expr *d
return NULL;
}
- if (source->expr_type == EXPR_CONSTANT)
+ if (source->expr_type == EXPR_CONSTANT
+ || source->expr_type == EXPR_STRUCTURE)
{
gcc_assert (dim == 0);
! { dg-do run }
! PR 68426 - simplification used to fail.
module m
implicit none
type t
integer :: i
end type t
type(t), dimension(2), parameter :: a1 = (/ t(1), t(2) /)
type(t), dimension(1), parameter :: c = spread ( a1(1), 1, 1 )
end module m
program main
use m
if (c(1)%i /= 1) stop 1
end program main
