Daily bump.

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index ce9e848178cceb51c144df7bc7e8453c6973b268..3194d0024f2c0222084a3b6a6c7fb1345b92c978 100644 (file)
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20231224
+20231225

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cbaf2efad084ddd2c443d4276d244f1e05105f3b..fd1b89d441901a07732d0d201f3ca7fa3e606238 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,14 @@
+2023-12-24  Patrick Palka  <ppalka@redhat.com>
+
+       Backported from master:
+       2023-09-22  Patrick Palka  <ppalka@redhat.com>
+
+       PR c++/111485
+       * pt.c (is_compatible_template_arg): New parameter 'args'.
+       Add the outer template arguments 'args' to 'new_args'.
+       (convert_template_argument): Pass 'args' to
+       is_compatible_template_arg.
+
 2023-12-20  Jason Merrill  <jason@redhat.com>
 
        Backported from master:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 272c75af2d196c5a462ffaf8a4666c0b19aab708..44403ff4e3770c8725f1eb019327d0241113b585 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2023-12-24  Patrick Palka  <ppalka@redhat.com>
+
+       Backported from master:
+       2023-09-22  Patrick Palka  <ppalka@redhat.com>
+
+       PR c++/111485
+       * g++.dg/cpp2a/concepts-ttp5.C: New test.
+       * g++.dg/cpp2a/concepts-ttp6.C: New test.
+
 2023-12-20  Jason Merrill  <jason@redhat.com>
 
        Backported from master: