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

re PR fortran/51966 (ICE in gfc_conv_array_constructor_expr) 

2012-01-24  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51966
        * resolve.c (resolve_structure_cons): Only create an
        array constructors for nonscalars.

2012-01-24  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51966
        * gfortran.dg/derived_constructor_char_3.f90: New.

From-SVN: r183510
This commit is contained in:
Tobias Burnus 2012-01-25 07:59:21 +01:00 committed by Tobias Burnus
parent d2bb8192ee
commit 083dd940dc
4 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2012-01-24 Tobias Burnus <burnus@net-b.de>
PR fortran/51966
* resolve.c (resolve_structure_cons): Only create an
array constructors for nonscalars.
2012-01-23 Tobias Burnus <burnus@net-b.de>
PR fortran/51948

1
gcc/fortran/resolve.c
View File

@ -1051,6 +1051,7 @@ resolve_structure_cons (gfc_expr *expr, int init)
&& comp->ts.u.cl->length->expr_type == EXPR_CONSTANT
&& cons->expr->ts.u.cl && cons->expr->ts.u.cl->length
&& cons->expr->ts.u.cl->length->expr_type == EXPR_CONSTANT
&& cons->expr->rank != 0
&& mpz_cmp (cons->expr->ts.u.cl->length->value.integer,
comp->ts.u.cl->length->value.integer) != 0)
{

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2012-01-24 Tobias Burnus <burnus@net-b.de>
PR fortran/51966
* gfortran.dg/derived_constructor_char_3.f90: New.
2012-01-24 Ian Lance Taylor <iant@google.com>
* go.test/go-test.exp (filecmp): New procedure.

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

@ -0,0 +1,30 @@
! { dg-do compile }
!
! PR fortran/51966
!
! Contributed by Peter Wind
!
type :: Deriv
character(len=10) :: name
end type
character(len=8), dimension(2), parameter :: &
DEF_ECOSYSTEMS = (/ "Gridxxxx", "StringYY" /)
type(Deriv), save :: DepEcoSystem = Deriv(DEF_ECOSYSTEMS(1))
if (DepEcoSystem%name /= "Gridxxxx" &
.or. DepEcoSystem%name(9:9) /= ' ' &
.or. DepEcoSystem%name(10:10) /= ' ') call abort()
DepEcoSystem%name = 'ABCDEFGHIJ'
call Init_EcoSystems()
if (DepEcoSystem%name /= "StringYY" &
.or. DepEcoSystem%name(9:9) /= ' ' &
.or. DepEcoSystem%name(10:10) /= ' ') call abort()
contains
subroutine Init_EcoSystems()
integer :: i =2
DepEcoSystem = Deriv(DEF_ECOSYSTEMS(i))
end subroutine Init_EcoSystems
end