Daily bump.

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index bcfb36f056289f6df8383f755a15ea1c646fa1a1..bd9df64a394f6b9f1cac6ff9a1dc9a940250a830 100644 (file)
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20250427
+20250428

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7e93bf8600109acfe3812d595021da743dd7ba84..f78cb2bbaaecfe9ee2f688ceeab32efc5453dfd6 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,24 @@
+2025-04-27  Nathaniel Shead  <nathanieloshead@gmail.com>
+
+       Backported from master:
+       2025-04-27  Nathaniel Shead  <nathanieloshead@gmail.com>
+
+       PR c++/119939
+       * module.cc (trees_out::lang_decl_vals): Also stream
+       lang->u.fn.context when DECL_UNIQUE_FRIEND_P.
+       (trees_in::lang_decl_vals): Likewise.
+
+2025-04-27  Nathaniel Shead  <nathanieloshead@gmail.com>
+
+       Backported from master:
+       2025-04-22  Nathaniel Shead  <nathanieloshead@gmail.com>
+
+       PR c++/119863
+       * name-lookup.cc (get_mergeable_namespace_binding): Remove
+       no-longer-used function.
+       (lookup_imported_hidden_friend): Also look for hidden imported
+       decls in an attached decl's module.
+
 2025-04-25  Release Manager
 
        * GCC 15.1.0 released.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 59bb0ea6e8f8d7098bbd385162a671f3c2a0e914..8a5303c95da34803b28be751d025d25ae72f5140 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2025-04-27  Nathaniel Shead  <nathanieloshead@gmail.com>
+
+       Backported from master:
+       2025-04-27  Nathaniel Shead  <nathanieloshead@gmail.com>
+
+       PR c++/119939
+       * g++.dg/modules/concept-11_a.H: New test.
+       * g++.dg/modules/concept-11_b.C: New test.
+
+2025-04-27  Nathaniel Shead  <nathanieloshead@gmail.com>
+
+       Backported from master:
+       2025-04-22  Nathaniel Shead  <nathanieloshead@gmail.com>
+
+       PR c++/119863
+       * g++.dg/modules/tpl-friend-18_a.C: New test.
+       * g++.dg/modules/tpl-friend-18_b.C: New test.
+       * g++.dg/modules/tpl-friend-18_c.C: New test.
+
 2025-04-25  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from master: