This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [Patch, Fortran, 66035, v2] [5/6 Regression] gfortran ICE segfault
- From: Mikael Morin <mikael dot morin at sfr dot fr>
- To: Andre Vehreschild <vehre at gmx dot de>, GCC-Patches-ML <gcc-patches at gcc dot gnu dot org>, GCC-Fortran-ML <fortran at gcc dot gnu dot org>
- Cc: Paul Richard Thomas <paul dot richard dot thomas at gmail dot com>
- Date: Fri, 10 Jul 2015 18:47:23 +0200
- Subject: Re: [Patch, Fortran, 66035, v2] [5/6 Regression] gfortran ICE segfault
- Authentication-results: sourceware.org; auth=none
- Authentication-results: sfrmc.priv.atos.fr; dkim=none (no signature); dkim-adsp=none (no policy) header dot from=mikael dot morin at sfr dot fr
- References: <20150508152950 dot 182a4c1a at gmx dot de> <554F573D dot 9030909 at sfr dot fr> <20150511124006 dot 62b5c58b at gmx dot de> <20150706135457 dot 429f0e35 at vepi2>
hello Andre.
Le 06/07/2015 13:54, Andre Vehreschild a écrit :
> Hi all,
>
> please find attached the next version of the patch for pr66035 fixing an ICE.
> Scope (copied from first submit):
>
> An ICE occurred when in a structure constructor an allocatable component of
> type class was initialized with an existing class object. This was caused by
>
> - the size of the memory to allocate for the component was miscalculated,
> - the vptr was not set correctly, and
> - when the class object to be used for init was allocatable already, it was
> copied wasting some memory instead of a view_convert inserted.
>
> Bootstraps and regtests fine on x86_64-linux-gnu/f21.
>
> Ok for trunk?
>
> Regards,
> Andre
>
>
> pr66035_2.patch
>
> diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
> index 195f7a4..74af725 100644
> --- a/gcc/fortran/trans-expr.c
> +++ b/gcc/fortran/trans-expr.c
> @@ -6903,6 +6903,29 @@ alloc_scalar_allocatable_for_subcomponent_assignment (stmtblock_t *block,
> TREE_TYPE (tmp), tmp,
> fold_convert (TREE_TYPE (tmp), size));
> }
> + else if (cm->ts.type == BT_CLASS)
> + {
> + gcc_assert (expr2->ts.type == BT_CLASS || expr2->ts.type == BT_DERIVED);
> + if (expr2->ts.type == BT_DERIVED)
> + {
> + tmp = gfc_get_symbol_decl (expr2->ts.u.derived);
> + size = TYPE_SIZE_UNIT (tmp);
> + }
> + else
> + {
> + gfc_expr *e2vtab;
> + gfc_se se;
> + e2vtab = gfc_find_and_cut_at_last_class_ref (expr2);
> + gfc_add_vptr_component (e2vtab);
> + gfc_add_size_component (e2vtab);
> + gfc_init_se (&se, NULL);
> + gfc_conv_expr (&se, e2vtab);
> + gfc_add_block_to_block (block, &se.pre);
> + size = fold_convert (size_type_node, se.expr);
> + gfc_free_expr (e2vtab);
> + }
> + size_in_bytes = size;
> + }
> else
> {
> /* Otherwise use the length in bytes of the rhs. */
That part is OK.
> @@ -7030,7 +7053,8 @@ gfc_trans_subcomponent_assign (tree dest, gfc_component * cm, gfc_expr * expr,
> gfc_add_expr_to_block (&block, tmp);
> }
> else if (init && (cm->attr.allocatable
> - || (cm->ts.type == BT_CLASS && CLASS_DATA (cm)->attr.allocatable)))
> + || (cm->ts.type == BT_CLASS && CLASS_DATA (cm)->attr.allocatable
> + && expr->ts.type != BT_CLASS)))
> {
> /* Take care about non-array allocatable components here. The alloc_*
> routine below is motivated by the alloc_scalar_allocatable_for_
> @@ -7074,6 +7098,14 @@ gfc_trans_subcomponent_assign (tree dest, gfc_component * cm, gfc_expr * expr,
> tmp = gfc_build_memcpy_call (tmp, se.expr, size);
> gfc_add_expr_to_block (&block, tmp);
> }
> + else if (cm->ts.type == BT_CLASS && expr->ts.type == BT_CLASS)
> + {
> + tmp = gfc_copy_class_to_class (se.expr, dest, integer_one_node,
> + CLASS_DATA (cm)->attr.unlimited_polymorphic);
> + gfc_add_expr_to_block (&block, tmp);
> + gfc_add_modify (&block, gfc_class_vptr_get (dest),
> + gfc_class_vptr_get (se.expr));
> + }
> else
> gfc_add_modify (&block, tmp,
> fold_convert (TREE_TYPE (tmp), se.expr));
But this hunk is canceled by the one before, isn't it?
I mean, If the condition here is true, the condition before was false?
Mikael