diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2013-11-04 19:42:24 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2013-11-04 19:42:24 +0000 |
| commit | 4ca469cf46edbb65229f40618a8bb3919f22bc5f (patch) | |
| tree | 85e2363a2166c257385f1c506e8061ed35e4cb45 /gcc | |
| parent | efaf512c94161056ad9834cf2d4f53d25e77aa2d (diff) | |
| download | gcc-4ca469cf46edbb65229f40618a8bb3919f22bc5f.zip gcc-4ca469cf46edbb65229f40618a8bb3919f22bc5f.tar.gz gcc-4ca469cf46edbb65229f40618a8bb3919f22bc5f.tar.bz2 | |
re PR fortran/57445 ([OOP] ICE in gfc_conv_class_to_class - for OPTIONAL polymorphic array)
2013-11-04 Paul Thomas <pault@gcc.gnu.org>
PR fortran/57445
* trans-expr.c (gfc_conv_class_to_class): Remove spurious
assert.
2013-11-04 Paul Thomas <pault@gcc.gnu.org>
PR fortran/57445
* gfortran.dg/optional_class_1.f90 : New test
From-SVN: r204356
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/optional_class_1.f90 | 45 |
4 files changed, 57 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 059b7b3..f37eeca 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2013-11-04 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/57445 + * trans-expr.c (gfc_conv_class_to_class): Remove spurious + assert. + 2013-10-29 Tobias Burnus <burnus@net-b.de> PR fortran/44350 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index a590ca1..9586ca3 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -737,7 +737,6 @@ gfc_conv_class_to_class (gfc_se *parmse, gfc_expr *e, gfc_typespec class_ts, gfc_add_modify (&parmse->post, vptr, fold_convert (TREE_TYPE (vptr), ctree)); - gcc_assert (!optional || (optional && !copyback)); if (optional) { tree tmp2; @@ -7769,7 +7768,7 @@ is_runtime_conformable (gfc_expr *expr1, gfc_expr *expr2) e1 = a->expr; if (e1->rank > 0 && !is_runtime_conformable (expr1, e1)) return false; - } + } return true; } else if (expr2->value.function.isym diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1f487d7..43813fb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-11-04 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/57445 + * gfortran.dg/optional_class_1.f90 : New test + 2013-11-04 Vladimir Makarov <vmakarov@redhat.com> PR rtl-optimization/58968 diff --git a/gcc/testsuite/gfortran.dg/optional_class_1.f90 b/gcc/testsuite/gfortran.dg/optional_class_1.f90 new file mode 100644 index 0000000..589fc60 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/optional_class_1.f90 @@ -0,0 +1,45 @@ +! { dg-do run } +! +! PR fortran/57445 +! +! Contributed by Tobias Burnus <burnus@gcc.gnu.org> +! +! Spurious assert was added at revision 192495 +! +module m + implicit none + type t + integer :: i + end type t +contains + subroutine opt(xa, xc, xaa, xca) + type(t), allocatable, intent(out), optional :: xa + class(t), allocatable, intent(out), optional :: xc + type(t), allocatable, intent(out), optional :: xaa(:) + class(t), allocatable, intent(out), optional :: xca(:) + if (present (xca)) call foo_opt(xca=xca) + end subroutine opt + subroutine foo_opt(xa, xc, xaa, xca) + type(t), allocatable, intent(out), optional :: xa + class(t), allocatable, intent(out), optional :: xc + type(t), allocatable, intent(out), optional :: xaa(:) + class(t), allocatable, intent(out), optional :: xca(:) + if (present (xca)) then + if (allocated (xca)) deallocate (xca) + allocate (xca(3), source = [t(9),t(99),t(999)]) + end if + end subroutine foo_opt +end module m + use m + class(t), allocatable :: xca(:) + allocate (xca(1), source = t(42)) + select type (xca) + type is (t) + if (any (xca%i .ne. [42])) call abort + end select + call opt (xca = xca) + select type (xca) + type is (t) + if (any (xca%i .ne. [9,99,999])) call abort + end select +end |