commit: b83b3cd6a079211515a891c3c8bfd008a197f1d6 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Apr 10 21:59:22 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Apr 10 21:59:22 2025 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=b83b3cd6
15.0.0: drop C++/qt patch merged upstream Signed-off-by: Sam James <sam <AT> gentoo.org> 15.0.0/gentoo/83_all_PR119687.patch | 77 ------------------------------------- 15.0.0/gentoo/README.history | 1 - 2 files changed, 78 deletions(-) diff --git a/15.0.0/gentoo/83_all_PR119687.patch b/15.0.0/gentoo/83_all_PR119687.patch deleted file mode 100644 index 86874fa..0000000 --- a/15.0.0/gentoo/83_all_PR119687.patch +++ /dev/null @@ -1,77 +0,0 @@ -https://inbox.sourceware.org/gcc-patches/20250409151104.2600656-1-ppa...@redhat.com/ - -From 660e4bf9391692acb0bb18ba5eb38e689ae0a8a6 Mon Sep 17 00:00:00 2001 -Message-ID: <660e4bf9391692acb0bb18ba5eb38e689ae0a8a6.1744212391.git....@gentoo.org> -From: Patrick Palka <ppa...@redhat.com> -Date: Wed, 9 Apr 2025 11:11:04 -0400 -Subject: [PATCH] c++: alias_ctad_tweaks ICE w/ inherited CTAD [PR119687] - -With inherited CTAD the set of guides may be a two-dimensional overload -set (i.e. OVERLOADs containing OVERLOADs) so alias_ctad_tweaks (which -also handles the inherited CTAD transformation) needs to use the 2D-aware -lkp_iterator instead of ovl_iterator. Actually, we might as well use -the more idiomatic lkp_range here. - - PR c++/119687 - -gcc/cp/ChangeLog: - - * pt.cc (alias_ctad_tweaks): Use lkp_range / lkp_iterator - instead of ovl_iterator. - -gcc/testsuite/ChangeLog: - -* g++.dg/cpp23/class-deduction-inherited8.C: New test. ---- - gcc/cp/pt.cc | 3 +-- - .../g++.dg/cpp23/class-deduction-inherited8.C | 21 +++++++++++++++++++ - 2 files changed, 22 insertions(+), 2 deletions(-) - create mode 100644 gcc/testsuite/g++.dg/cpp23/class-deduction-inherited8.C - -diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc -index 0e120c4040ed..352a7f4ed316 100644 ---- a/gcc/cp/pt.cc -+++ b/gcc/cp/pt.cc -@@ -30937,9 +30937,8 @@ alias_ctad_tweaks (tree tmpl, tree uguides) - tree aguides = NULL_TREE; - tree atparms = INNERMOST_TEMPLATE_PARMS (fullatparms); - unsigned natparms = TREE_VEC_LENGTH (atparms); -- for (ovl_iterator iter (uguides); iter; ++iter) -+ for (tree f : lkp_range (uguides)) - { -- tree f = *iter; - tree in_decl = f; - location_t loc = DECL_SOURCE_LOCATION (f); - tree ret = TREE_TYPE (TREE_TYPE (f)); -diff --git a/gcc/testsuite/g++.dg/cpp23/class-deduction-inherited8.C b/gcc/testsuite/g++.dg/cpp23/class-deduction-inherited8.C -new file mode 100644 -index 000000000000..79fceadd9e1c ---- /dev/null -+++ b/gcc/testsuite/g++.dg/cpp23/class-deduction-inherited8.C -@@ -0,0 +1,21 @@ -+// PR c++/119687 -+// { dg-do compile { target c++20 } } -+ -+template <typename> class QFlagsStorage{}; -+ -+template <typename Enum> struct QFlagsStorageHelper : QFlagsStorage<Enum> { -+ using QFlagsStorage<Enum>::QFlagsStorage; -+ -+public: -+ QFlagsStorageHelper(Enum); -+}; -+ -+template <typename Enum> struct QFlags : public QFlagsStorageHelper<Enum> { -+ using Base = QFlagsStorageHelper<Enum>; -+ using Base::Base; -+ QFlags(Enum); -+}; -+ -+void f(int flag) { -+ QFlags{int{}}; -+} - -base-commit: 334545194d9023fb9b2f72ee0dcde8af94930f25 --- -2.49.0 - diff --git a/15.0.0/gentoo/README.history b/15.0.0/gentoo/README.history index 190b29b..f0db01f 100644 --- a/15.0.0/gentoo/README.history +++ b/15.0.0/gentoo/README.history @@ -6,7 +6,6 @@ - 86_all_combine-Limit-insn-searchs-for-2-2-combinations-PR11.patch - 87_all_simplify-rtx-Fix-shortcut-for-vector-eq-ne.patch - 88_all_PR119614.patch - + 83_all_PR119687.patch + 84_all_PR116975.patch 53 7 April 2025
