diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2011-01-31 23:51:59 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2011-01-31 23:51:59 +0100 |
| commit | 463ec8224b9fc5661646c4f8c9242c92ebb08f72 (patch) | |
| tree | a8b4296e4e8b0e26e311a219c1b461f791761117 | |
| parent | f16072b6e873b66b7998ac2937b2e4d5b54ffbb3 (diff) | |
| download | gcc-463ec8224b9fc5661646c4f8c9242c92ebb08f72.zip gcc-463ec8224b9fc5661646c4f8c9242c92ebb08f72.tar.gz gcc-463ec8224b9fc5661646c4f8c9242c92ebb08f72.tar.bz2 | |
re PR fortran/47455 ([OOP] internal compiler error: in fold_convert_loc, at fold-const.c:2028)
2011-01-31 Janus Weil <janus@gcc.gnu.org>
PR fortran/47455
* trans-expr.c (gfc_conv_procedure_call): Handle procedure pointers
with pointer or allocatable result.
2011-01-31 Janus Weil <janus@gcc.gnu.org>
PR fortran/47455
* gfortran.dg/typebound_call_19.f03: New.
From-SVN: r169455
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/typebound_call_19.f03 | 51 |
4 files changed, 65 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ae08fdc..e05645d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2011-01-31 Janus Weil <janus@gcc.gnu.org> + + PR fortran/47455 + * trans-expr.c (gfc_conv_procedure_call): Handle procedure pointers + with pointer or allocatable result. + 2011-01-31 Paul Thomas <pault@gcc.gnu.org> PR fortran/47519 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 9682802..b5b6d61 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -3606,10 +3606,9 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym, x = f() where f is pointer valued, we have to dereference the result. */ if (!se->want_pointer && !byref - && (sym->attr.pointer || sym->attr.allocatable) - && !gfc_is_proc_ptr_comp (expr, NULL)) - se->expr = build_fold_indirect_ref_loc (input_location, - se->expr); + && ((!comp && (sym->attr.pointer || sym->attr.allocatable)) + || (comp && (comp->attr.pointer || comp->attr.allocatable)))) + se->expr = build_fold_indirect_ref_loc (input_location, se->expr); /* f2c calling conventions require a scalar default real function to return a double precision result. Convert this back to default diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7d22d04..17bb107 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-01-31 Janus Weil <janus@gcc.gnu.org> + + PR fortran/47455 + * gfortran.dg/typebound_call_19.f03: New. + 2011-01-31 Jakub Jelinek <jakub@redhat.com> PR c++/47416 diff --git a/gcc/testsuite/gfortran.dg/typebound_call_19.f03 b/gcc/testsuite/gfortran.dg/typebound_call_19.f03 new file mode 100644 index 0000000..95b272a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/typebound_call_19.f03 @@ -0,0 +1,51 @@ +! { dg-do run } +! +! PR 47455: [4.6 Regression][OOP] internal compiler error: in fold_convert_loc, at fold-const.c:2028 +! +! Contributed by Thomas Henlich <thenlich@users.sourceforge.net> + +module class_t + type :: tx + integer :: i + end type + type :: t + type(tx) :: x + procedure(find_x), pointer :: ppc + contains + procedure :: find_x + end type + type(tx), target :: zero = tx(0) +contains + function find_x(this) + class(t), intent(in) :: this + type(tx), pointer :: find_x + find_x => zero + end function find_x +end module + +program test + use class_t + class(t),allocatable :: this + procedure(find_x), pointer :: pp + allocate(this) + ! (1) ordinary function call + zero = tx(1) + this%x = find_x(this) + if (this%x%i /= 1) call abort() + ! (2) procedure pointer + zero = tx(2) + pp => find_x + this%x = pp(this) + if (this%x%i /= 2) call abort() + ! (3) PPC + zero = tx(3) + this%ppc => find_x + this%x = this%ppc() + if (this%x%i /= 3) call abort() + ! (4) TBP + zero = tx(4) + this%x = this%find_x() + if (this%x%i /= 4) call abort() +end + +! { dg-final { cleanup-modules "class_t" } } |