Daily bump.

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 76bd88aee70f12f30eba294dfbe0c8d1abc97580..20aebe180f39a1f5e0fe0326af98bf1b07416fa6 100644 (file)
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20220424
+20220425

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index cf68ff10c2bb3adf417e1b6d0672feef57086f28..9f39919d52ffbbcf87552e160536b2ad51020257 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,17 @@
+2022-04-24  Mikael Morin  <mikael@gcc.gnu.org>
+
+       PR fortran/104228
+       PR fortran/104570
+       * parse.c (parse_associate): Use a new distinct gfc_charlen if
+       the copied type has one whose length is not known to be
+       constant.
+       * resolve.c (resolve_assoc_var): Also create a new character
+       length for non-dummy associate targets.  Reset charlen if it’s
+       shared with the associate target regardless of the expression
+       type.  Don’t reinitialize charlen if it’s deferred.
+       * trans-stmt.c (trans_associate_var): Initialize character
+       length even if no temporary is used for the associate variable.
+
 2022-04-21  Fritz Reese  <foreese@gcc.gnu.org>
 
        Backported from master:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d053567de8e4853b759180616eefb5cd33991a4d..c299a831edd3154a7d8b620d1b6b9aa2096e928f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2022-04-24  Mikael Morin  <mikael@gcc.gnu.org>
+
+       PR fortran/104228
+       PR fortran/104570
+       * gfortran.dg/asan_associate_58.f90: New test.
+       * gfortran.dg/asan_associate_59.f90: New test.
+       * gfortran.dg/associate_58.f90: New test.
+
 2022-04-21  Fritz Reese  <foreese@gcc.gnu.org>
 
        Backported from master: