From b0ae33baab449487d7438b6458d42887941e7d11 Mon Sep 17 00:00:00 2001 From: Andre Vehreschild Date: Wed, 7 Oct 2015 12:58:46 +0200 Subject: [PATCH] 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/ChangeLog | 6 ++++++ gcc/fortran/trans-intrinsic.c | 11 ++++++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/sizeof_5.f90 | 15 +++++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/sizeof_5.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4dba1deac9e..8d21be5b64e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +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. + 2015-10-06 Louis Krupp PR fortran/65766 * resolve.c (gfc_resolve_substring_charlen): For derived type, diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 35052bebb8e..ac61c096a99 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 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1882fbd03dc..2b7094692cd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-10-07 Andre Vehreschild + + PR fortran/65889 + * gfortran.dg/sizeof_5.f90: New test. + 2015-10-06 Jeff Law * gcc.c-torture/compile/pr67816.c: New test. diff --git a/gcc/testsuite/gfortran.dg/sizeof_5.f90 b/gcc/testsuite/gfortran.dg/sizeof_5.f90 new file mode 100644 index 00000000000..0e1496a2f73 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/sizeof_5.f90 @@ -0,0 +1,15 @@ +! { dg-do compile } +! +! PR fortran/65889 +! +! +module m + type n + end type n +contains + subroutine g(ns) + class(n), intent(out), allocatable, dimension(:) :: ns + class(n), allocatable, dimension(:) :: tmp + write (0,*) sizeof(ns), sizeof(tmp) + end subroutine g +end module m -- 2.30.2