Daily bump.

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index b858c4c782c277523a9023bc370157bea5ee1d7f..49d6a92f23fb19a8b42451f6667a604b8a37a35f 100644 (file)
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20201024
+20201025

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bda8123fc8857438c21dc7d370ebf445752c42b0..912f437fffdf106860c6253b3a528be466cf2069 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,13 @@
+2020-10-24  Marek Polacek  <polacek@redhat.com>
+
+       Backported from master:
+       2020-10-24  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/96241
+       * constexpr.c (cxx_eval_array_reference): Set up ctx->ctor if we
+       are initializing an aggregate.  Call free_constructor on the new
+       CONSTRUCTOR if it isn't returned from cxx_eval_constant_expression.
+
 2020-10-22  Patrick Palka  <ppalka@redhat.com>
 
        Backported from master:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 66a258ace12fc90e69bd833b9e7208ac098dced3..29b46f9dac5327ba9b0253757ba7618156b5911d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2020-10-24  Marek Polacek  <polacek@redhat.com>
+
+       Backported from master:
+       2020-10-24  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/96241
+       * g++.dg/cpp0x/constexpr-96241.C: New test.
+       * g++.dg/cpp1y/constexpr-96241.C: New test.
+
 2020-10-22  Harald Anlauf  <anlauf@gmx.de>
 
        Backported from master: