From b0ae33baab449487d7438b6458d42887941e7d11 Mon Sep 17 00:00:00 2001 From: Andre Vehreschild Date: Wed, 7 Oct 2015 12:58:46 +0200 Subject: re PR fortran/65889 ([6 Regressions] [OOP] ICE with sizeof a polymorphic variable.) gcc/fortran/ChangeLog: 2015-10-07 Andre Vehreschild PR fortran/65889 * trans-intrinsic.c (gfc_conv_intrinsic_sizeof): Handle pointer to and on stack class objects as sizeof parameter. gcc/testsuite/ChangeLog: 2015-10-07 Andre Vehreschild PR fortran/65889 * gfortran.dg/sizeof_5.f90: New test. From-SVN: r228566 --- gcc/fortran/trans-intrinsic.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gcc/fortran/trans-intrinsic.c') diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 35052be..ac61c09 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -5937,11 +5937,16 @@ gfc_conv_intrinsic_sizeof (gfc_se *se, gfc_expr *expr) } else if (arg->ts.type == BT_CLASS) { - /* For deferred length arrays, conv_expr_descriptor returns an - indirect_ref to the component. */ + /* Conv_expr_descriptor returns a component_ref to _data component of the + class object. The class object may be a non-pointer object, e.g. + located on the stack, or a memory location pointed to, e.g. a + parameter, i.e., an indirect_ref. */ if (arg->rank < 0 || (arg->rank > 0 && !VAR_P (argse.expr) - && GFC_DECL_CLASS (TREE_OPERAND (argse.expr, 0)))) + && ((INDIRECT_REF_P (TREE_OPERAND (argse.expr, 0)) + && GFC_DECL_CLASS (TREE_OPERAND ( + TREE_OPERAND (argse.expr, 0), 0))) + || GFC_DECL_CLASS (TREE_OPERAND (argse.expr, 0))))) byte_size = gfc_class_vtab_size_get (TREE_OPERAND (argse.expr, 0)); else if (arg->rank > 0) /* The scalarizer added an additional temp. To get the class' vptr -- cgit v1.1