From 43538a7e4bdc0d37e7ed9590e854c8cb2874eaac Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Mon, 25 Dec 2023 00:21:13 +0000 Subject: [PATCH] Daily bump. --- gcc/DATESTAMP | 2 +- gcc/cp/ChangeLog | 11 +++++++++++ gcc/testsuite/ChangeLog | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP index ce9e848178cc..3194d0024f2c 100644 --- a/gcc/DATESTAMP +++ b/gcc/DATESTAMP @@ -1 +1 @@ -20231224 +20231225 diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cbaf2efad084..fd1b89d44190 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,14 @@ +2023-12-24 Patrick Palka + + Backported from master: + 2023-09-22 Patrick Palka + + 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 Backported from master: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 272c75af2d19..44403ff4e377 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2023-12-24 Patrick Palka + + Backported from master: + 2023-09-22 Patrick Palka + + PR c++/111485 + * g++.dg/cpp2a/concepts-ttp5.C: New test. + * g++.dg/cpp2a/concepts-ttp6.C: New test. + 2023-12-20 Jason Merrill Backported from master: -- 2.47.2