Follow up to r213079.

2014-07-26  Tobias Burnus  <burnus@net-b.de>

        PR fortran/61881
        PR fortran/61888
        PR fortran/57305
        * intrinsic.texi (SIZEOF): Document changed behavior
        for polymorphic arrays.

From-SVN: r213085

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 9a82894275be26c8745d360a02fb1460911c1f32..cf1df3fe2296493a7d22b20281c014700cb73dd6 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,16 @@
 2014-07-26  Tobias Burnus  <burnus@net-b.de>
 
+       PR fortran/61881
+       PR fortran/61888
+       PR fortran/57305
+       * intrinsic.texi (SIZEOF): Document changed behavior
+       for polymorphic arrays.
+
+2014-07-26  Tobias Burnus  <burnus@net-b.de>
+
+       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 6c4cb0917a411c0f2597e02877daba3e69b62626..0f4a8a7021fe30cc8f3c5a604cbb463317d93965 100644 (file)
--- 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 9575f076f81cdd4668e3e8df6a8b61b6de4194e1..2d835c9639cf7f49e379affe7826cbed0f1dd0e5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -5,6 +5,9 @@
 
 2014-07-26  Tobias Burnus  <burnus@net-b.de>
 
+       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