diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2010-12-13 17:16:06 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2010-12-13 17:16:06 +0100 |
| commit | b54b7821c6b32cff037379b52dcac84a4d7aab5a (patch) | |
| tree | e6dc67fb2a545e33e124262ec3c3118207134394 | |
| parent | 0d64a1a38f97173aebcf25612a4be0fa53be5dfa (diff) | |
| download | gcc-b54b7821c6b32cff037379b52dcac84a4d7aab5a.zip gcc-b54b7821c6b32cff037379b52dcac84a4d7aab5a.tar.gz gcc-b54b7821c6b32cff037379b52dcac84a4d7aab5a.tar.bz2 | |
re PR fortran/46841 ([F03] ICE on allocating array of procedure pointers)
2010-12-13 Janus Weil <janus@gcc.gnu.org>
PR fortran/46841
* trans-expr.c (gfc_trans_subcomponent_assign): Handle array-valued
procedure pointer components.
2010-12-13 Janus Weil <janus@gcc.gnu.org>
PR fortran/46841
* gfortran.dg/proc_ptr_comp_26.f90: New.
From-SVN: r167750
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/proc_ptr_comp_26.f90 | 22 |
4 files changed, 34 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 35c4b6e..ae78f9f 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2010-12-13 Janus Weil <janus@gcc.gnu.org> + + PR fortran/46841 + * trans-expr.c (gfc_trans_subcomponent_assign): Handle array-valued + procedure pointer components. + 2010-12-13 Jakub Jelinek <jakub@redhat.com> PR fortran/46884 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 72a7c2c..6681a6a 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -4452,7 +4452,7 @@ gfc_trans_subcomponent_assign (tree dest, gfc_component * cm, gfc_expr * expr) gfc_class_null_initializer (&cm->ts)); gfc_add_expr_to_block (&block, tmp); } - else if (cm->attr.dimension) + else if (cm->attr.dimension && !cm->attr.proc_pointer) { if (cm->attr.allocatable && expr->expr_type == EXPR_NULL) gfc_conv_descriptor_data_set (&block, dest, null_pointer_node); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 58df9e5..d52333f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-12-13 Janus Weil <janus@gcc.gnu.org> + + PR fortran/46841 + * gfortran.dg/proc_ptr_comp_26.f90: New. + 2010-12-13 Eric Botcazou <ebotcazou@adacore.com> * gnat.dg/pack9.adb: XFAIL everywhere. diff --git a/gcc/testsuite/gfortran.dg/proc_ptr_comp_26.f90 b/gcc/testsuite/gfortran.dg/proc_ptr_comp_26.f90 new file mode 100644 index 0000000..0b97e09 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/proc_ptr_comp_26.f90 @@ -0,0 +1,22 @@ +! { dg-do compile } +! +! PR 46841: [F03] ICE on allocating array of procedure pointers +! +! Contributed by Martien Hulsen <m.a.hulsen@tue.nl> + + type vfunc_p + procedure (dum_vfunc), pointer, nopass :: p => null() + end type vfunc_p + + type(vfunc_p), allocatable, dimension(:) :: vfunc1 + + allocate(vfunc1(10)) + +contains + + function dum_vfunc () + real, dimension(2) :: dum_vfunc + dum_vfunc = 0 + end function dum_vfunc + +end |