commit: 0f4b833b534f19465c433eabd4599de920bfc48d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat May 10 15:27:38 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat May 10 15:27:58 2025 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=0f4b833b
16.0.0: drop switch patch merged upstream Signed-off-by: Sam James <sam <AT> gentoo.org> ...t-assert-that-switch-has-nondefault-cases.patch | 50 ---------------------- 16.0.0/gentoo/README.history | 5 ++- 2 files changed, 4 insertions(+), 51 deletions(-) diff --git a/16.0.0/gentoo/85_all_gimple-Don-t-assert-that-switch-has-nondefault-cases.patch b/16.0.0/gentoo/85_all_gimple-Don-t-assert-that-switch-has-nondefault-cases.patch deleted file mode 100644 index 1d2eb1f..0000000 --- a/16.0.0/gentoo/85_all_gimple-Don-t-assert-that-switch-has-nondefault-cases.patch +++ /dev/null @@ -1,50 +0,0 @@ -From bd8ccb7e0eefaac80028b4ffd16d09b91f3fe5f2 Mon Sep 17 00:00:00 2001 -Message-ID: <bd8ccb7e0eefaac80028b4ffd16d09b91f3fe5f2.1746833337.git....@gentoo.org> -From: Filip Kastl <[email protected]> -Date: Fri, 9 May 2025 16:04:25 +0200 -Subject: [PATCH] gimple: Don't assert that switch has nondefault cases during - lowering [PR120080] - -I have mistakenly assumed that switch lowering cannot encounter a switch -with zero clusters. This patch removes the relevant assert and instead -gives up bit-test lowering when this happens. - - PR tree-optimization/120080 - -gcc/ChangeLog: - - * tree-switch-conversion.cc (bit_test_cluster::find_bit_tests): - Replace assert with return. - -Signed-off-by: Filip Kastl <[email protected]> ---- - gcc/tree-switch-conversion.cc | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/gcc/tree-switch-conversion.cc b/gcc/tree-switch-conversion.cc -index dea217a01efb..bd4de966892c 100644 ---- a/gcc/tree-switch-conversion.cc -+++ b/gcc/tree-switch-conversion.cc -@@ -1793,12 +1793,14 @@ bit_test_cluster::find_bit_tests (vec<cluster *> &clusters, int max_c) - end up with as few clusters as possible. */ - - unsigned l = clusters.length (); -- auto_vec<min_cluster_item> min; -- min.reserve (l + 1); - -- gcc_checking_assert (l > 0); -+ if (l == 0) -+ return clusters.copy (); - gcc_checking_assert (l <= INT_MAX); - -+ auto_vec<min_cluster_item> min; -+ min.reserve (l + 1); -+ - int bits_in_word = GET_MODE_BITSIZE (word_mode); - - /* First phase: Compute the minimum number of clusters for each prefix of the - -base-commit: a470433732e77ae29a717cf79049ceeea3cbe979 --- -2.49.0 - diff --git a/16.0.0/gentoo/README.history b/16.0.0/gentoo/README.history index 4b20dc5..afa3849 100644 --- a/16.0.0/gentoo/README.history +++ b/16.0.0/gentoo/README.history @@ -1,6 +1,9 @@ 2 ???? - + 85_all_gimple-Don-t-assert-that-switch-has-nondefault-cases.patch + - 85_all_PR120080_Revert-gimple-Switch-bit-test-lowering-testcases-for.patch + - 86_all_PR120080_Revert-gimple-Don-t-warn-about-using-different-algs-.patch + - 87_all_PR120080-Revert-gimple-Make-bit-test-switch-lowering-more-pow.patch + - 88_all_PR120080-Revert-gimple-Merge-slow-and-fast-bit-test-switch-lo.patch 1 5 May 2025
