diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 35c4b6e540e..ae78f9f330d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2010-12-13 Janus Weil + + PR fortran/46841 + * trans-expr.c (gfc_trans_subcomponent_assign): Handle array-valued + procedure pointer components. + 2010-12-13 Jakub Jelinek PR fortran/46884 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 72a7c2c9015..6681a6ab3df 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 58df9e5ced8..d52333f4603 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-12-13 Janus Weil + + PR fortran/46841 + * gfortran.dg/proc_ptr_comp_26.f90: New. + 2010-12-13 Eric Botcazou * 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 00000000000..0b97e09e03b --- /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 + + 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