diff options
| author | Mikael Morin <mikael@gcc.gnu.org> | 2010-09-23 11:11:23 +0000 |
|---|---|---|
| committer | Mikael Morin <mikael@gcc.gnu.org> | 2010-09-23 11:11:23 +0000 |
| commit | bef6486a5a2fdb1008e582d5ac048dd243e91142 (patch) | |
| tree | 94e5907b5697121d848e22dd6a4f1c3965a75700 /gcc | |
| parent | dca267461a4ec936658e9dccdb952a2ca4b9f3e4 (diff) | |
| download | gcc-bef6486a5a2fdb1008e582d5ac048dd243e91142.zip gcc-bef6486a5a2fdb1008e582d5ac048dd243e91142.tar.gz gcc-bef6486a5a2fdb1008e582d5ac048dd243e91142.tar.bz2 | |
re PR fortran/45745 (ICE in gfc_conv_array_stride)
2010-09-23 Mikael Morin <mikael@gcc.gnu.org>
PR fortran/45745
PR fortran/45648
* trans-array.c (gfc_conv_expr_descriptor): Handle
ss->type == GFC_SS_INTRINSIC (for {l,u}bound intrinsics) case.
2010-09-23 Mikael Morin <mikael@gcc.gnu.org>
PR fortran/45745
PR fortran/45648
* gfortran.dg/vector_subscript_bound_1.f90: New.
From-SVN: r164558
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 16 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/vector_subscript_bound_1.f90 | 19 |
4 files changed, 42 insertions, 6 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index d99720e..d57a449 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2010-09-23 Mikael Morin <mikael@gcc.gnu.org> + + PR fortran/45745 + PR fortran/45648 + * trans-array.c (gfc_conv_expr_descriptor): Handle + ss->type == GFC_SS_INTRINSIC (for {l,u}bound intrinsics) case. + 2010-09-23 Tobias Burnus <burnus@net-b.de> * intrinsic.texi (OpenMP modules): Add named constants of diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 310a42b..b32c3ec 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -5290,13 +5290,17 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss) return; } - if (ss->expr != expr) + if (ss->expr != expr || ss->type != GFC_SS_FUNCTION) { - /* Elemental function. */ - gcc_assert ((expr->value.function.esym != NULL - && expr->value.function.esym->attr.elemental) - || (expr->value.function.isym != NULL - && expr->value.function.isym->elemental)); + if (ss->expr != expr) + /* Elemental function. */ + gcc_assert ((expr->value.function.esym != NULL + && expr->value.function.esym->attr.elemental) + || (expr->value.function.isym != NULL + && expr->value.function.isym->elemental)); + else + gcc_assert (ss->type == GFC_SS_INTRINSIC); + need_tmp = 1; if (expr->ts.type == BT_CHARACTER && expr->ts.u.cl->length->expr_type != EXPR_CONSTANT) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 050e571..da30c4b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-09-23 Mikael Morin <mikael@gcc.gnu.org> + + PR fortran/45745 + PR fortran/45648 + * gfortran.dg/vector_subscript_bound_1.f90: New. + 2010-09-23 Richard Guenther <rguenther@suse.de> PR middle-end/45750 diff --git a/gcc/testsuite/gfortran.dg/vector_subscript_bound_1.f90 b/gcc/testsuite/gfortran.dg/vector_subscript_bound_1.f90 new file mode 100644 index 0000000..f432850 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/vector_subscript_bound_1.f90 @@ -0,0 +1,19 @@ +! { dg-do compile } +! +! PR fortran/45745 +! ICE with {L,U}BOUND intrinsic function as vector subscript on derived +! type component. +! +! Original test by Joost Van de Vondele <Joost.VandeVondele@pci.uzh.ch> + +MODULE pw_types + TYPE pw_type + REAL, DIMENSION ( : ), POINTER :: cr + END TYPE pw_type +CONTAINS + SUBROUTINE pw_write(pw) + TYPE(pw_type), INTENT(in) :: pw + PRINT *, pw%cr(LBOUND(pw%cr)) + PRINT *, pw%cr(UBOUND(pw%cr)) + END SUBROUTINE pw_write +END MODULE |