Daily bump.

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index bfa0d089ea982ff7d3ae5bba73b5478c33aca56e..14f7958584686435c741f6a02c5b423e91d9b284 100644 (file)
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20210224
+20210225

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d774b20280f9f434ffc9970c8d528b48d0dbf3a1..5da8e2763014187c942b74ccd17cff317165b39e 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,15 @@
+2021-02-24  Paul Thomas  <pault@gcc.gnu.org>
+
+       Backported from master:
+       2021-02-23  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/99124
+       * resolve.c (resolve_fl_procedure): Include class results in
+       the test for F2018, C15100.
+       * trans-array.c (get_class_info_from_ss): Do not use the saved
+       descriptor to obtain the class expression for variables. Use
+       gfc_get_class_from_expr instead.
+
 2021-02-23  Harald Anlauf  <anlauf@gmx.de>
 
        Backported from master:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2c69ffefa7c5b288eade7f02bebbe1ec609fd843..96cb287874dc1a632cf10640e62e830f77e486bb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2021-02-24  Paul Thomas  <pault@gcc.gnu.org>
+
+       Backported from master:
+       2021-02-23  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/99124
+       * gfortran.dg/class_defined_operator_2.f03 : New test.
+       * gfortran.dg/elemental_result_2.f90 : New test.
+       * gfortran.dg/class_assign_4.f90: Correct the non-conforming
+       elemental function with an allocatable result with an operator
+       interface with array dummies and result.
+
 2021-02-23  Harald Anlauf  <anlauf@gmx.de>
 
        Backported from master: