Hi Mikael, hi Paul, hi all,
Mikael, Paul: Thanks for timely review.
Committed as r228566.
Regards,
Andre
On Tue, 6 Oct 2015 17:52:55 +0200
Mikael Morin <[email protected]> wrote:
> Le 06/10/2015 16:22, Andre Vehreschild a écrit :
> > Hi all,
> >
> > the attached patch fixes a 6 regression when the argument of sizeof()
> > is a pointer to a class object, e.g., when the class object is
> > intent(out). The patch improves the check if the parameter is a
> > class object by previously checking whether the argument is the plain
> > object or a pointer to one and using TREE_OPERAND() once or twice,
> > respectively.
> >
> > Bootstraps and regtests ok on x86_64-linux-gnu/f21.
> >
> > Ok for trunk?
> >
> Ok. Thanks.
>
> Mikael
--
Andre Vehreschild * Email: vehre ad gmx dot de
Index: gcc/fortran/ChangeLog
===================================================================
--- gcc/fortran/ChangeLog (Revision 228565)
+++ gcc/fortran/ChangeLog (Arbeitskopie)
@@ -1,3 +1,9 @@
+2015-10-07 Andre Vehreschild <[email protected]>
+
+ 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 <[email protected]>
PR fortran/65766
* resolve.c (gfc_resolve_substring_charlen): For derived type,
Index: gcc/fortran/trans-intrinsic.c
===================================================================
--- gcc/fortran/trans-intrinsic.c (Revision 228565)
+++ gcc/fortran/trans-intrinsic.c (Arbeitskopie)
@@ -5937,11 +5937,16 @@
}
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
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog (Revision 228565)
+++ gcc/testsuite/ChangeLog (Arbeitskopie)
@@ -1,3 +1,8 @@
+2015-10-07 Andre Vehreschild <[email protected]>
+
+ PR fortran/65889
+ * gfortran.dg/sizeof_5.f90: New test.
+
2015-10-06 Jeff Law <[email protected]>
* gcc.c-torture/compile/pr67816.c: New test.
Index: gcc/testsuite/gfortran.dg/sizeof_5.f90
===================================================================
--- gcc/testsuite/gfortran.dg/sizeof_5.f90 (Revision 0)
+++ gcc/testsuite/gfortran.dg/sizeof_5.f90 (Arbeitskopie)
@@ -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
