From f1d935dce6e08d921379eacd75f44bb007c021dd Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Sat, 26 Jul 2014 19:56:39 +0200 Subject: [PATCH] Follow up to r213079. 2014-07-26 Tobias Burnus PR fortran/61881 PR fortran/61888 PR fortran/57305 * intrinsic.texi (SIZEOF): Document changed behavior for polymorphic arrays. From-SVN: r213085 --- gcc/fortran/ChangeLog | 11 +++++++++++ gcc/fortran/intrinsic.texi | 4 ++-- gcc/testsuite/ChangeLog | 3 +++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9a82894275b..cf1df3fe229 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,16 @@ 2014-07-26 Tobias Burnus + PR fortran/61881 + PR fortran/61888 + PR fortran/57305 + * intrinsic.texi (SIZEOF): Document changed behavior + for polymorphic arrays. + +2014-07-26 Tobias Burnus + + PR fortran/61881 + PR fortran/61888 + PR fortran/57305 * check.c (gfc_check_sizeof): Permit for assumed type if and only if it has an array descriptor. * intrinsic.c (do_ts29113_check): Permit SIZEOF. diff --git a/gcc/fortran/intrinsic.texi b/gcc/fortran/intrinsic.texi index 6c4cb0917a4..0f4a8a7021f 100644 --- a/gcc/fortran/intrinsic.texi +++ b/gcc/fortran/intrinsic.texi @@ -12204,10 +12204,10 @@ number of bytes occupied by the argument. If the argument has the to is returned. If the argument is of a derived type with @code{POINTER} or @code{ALLOCATABLE} components, the return value does not account for the sizes of the data pointed to by these components. If the argument is -polymorphic, the size according to the declared type is returned. The argument +polymorphic, the size according to the dynamic type is returned. The argument may not be a procedure or procedure pointer. Note that the code assumes for arrays that those are contiguous; for contiguous arrays, it returns the -storage or an array element multiplicated by the size of the array. +storage or an array element multiplied by the size of the array. @item @emph{Example}: @smallexample diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9575f076f81..2d835c9639c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -5,6 +5,9 @@ 2014-07-26 Tobias Burnus + PR fortran/61881 + PR fortran/61888 + PR fortran/57305 * gfortran.dg/sizeof_2.f90: Change dg-error. * gfortran.dg/sizeof_4.f90: New. * gfortran.dg/storage_size_1.f08: Correct expected