{"id":2226901,"url":"http://patchwork.ozlabs.org/api/patches/2226901/?format=json","web_url":"http://patchwork.ozlabs.org/project/gcc/patch/bmm.hhupkhd5tk.gcc.gcc-TEST.fdumont.128.1.1@forge-stage.sourceware.org/","project":{"id":17,"url":"http://patchwork.ozlabs.org/api/projects/17/?format=json","name":"GNU Compiler Collection","link_name":"gcc","list_id":"gcc-patches.gcc.gnu.org","list_email":"gcc-patches@gcc.gnu.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"","list_archive_url":null,"date":"2026-04-22T19:05:13","name":"[v1,1/1] libstdc++: Fix std::erase_if behavior for std::__debug::deque","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ded36424beef12db8231c12a54c52e636418a5e7","submitter":{"id":93220,"url":"http://patchwork.ozlabs.org/api/people/93220/?format=json","name":"François Dumont via Sourceware Forge","email":"forge-bot+fdumont@forge-stage.sourceware.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/gcc/patch/bmm.hhupkhd5tk.gcc.gcc-TEST.fdumont.128.1.1@forge-stage.sourceware.org/mbox/","series":[{"id":501112,"url":"http://patchwork.ozlabs.org/api/series/501112/?format=json","web_url":"http://patchwork.ozlabs.org/project/gcc/list/?series=501112","date":"2026-04-22T19:05:13","name":"[v1,1/1] libstdc++: Fix std::erase_if behavior for std::__debug::deque","version":1,"mbox":"http://patchwork.ozlabs.org/series/501112/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2226901/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226901/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","gcc-patches@gcc.gnu.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","gcc-patches@gcc.gnu.org"],"Authentication-Results":["legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org\n (client-ip=2620:52:6:3111::32; helo=vm01.sourceware.org;\n envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org;\n receiver=patchwork.ozlabs.org)","sourceware.org; dmarc=none (p=none dis=none)\n header.from=forge-stage.sourceware.org","sourceware.org;\n spf=pass smtp.mailfrom=forge-stage.sourceware.org","server2.sourceware.org;\n arc=none smtp.remote-ip=38.145.34.39"],"Received":["from vm01.sourceware.org (vm01.sourceware.org\n [IPv6:2620:52:6:3111::32])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g1C4S1sWvz1yDD\n\tfor ; Thu, 23 Apr 2026 07:27:52 +1000 (AEST)","from vm01.sourceware.org (localhost [127.0.0.1])\n\tby sourceware.org (Postfix) with ESMTP id 6A72C458048F\n\tfor ; Wed, 22 Apr 2026 21:27:50 +0000 (GMT)","from forge-stage.sourceware.org (vm08.sourceware.org [38.145.34.39])\n by sourceware.org (Postfix) with ESMTPS id B4C8F441B8F9\n for ; Wed, 22 Apr 2026 19:06:36 +0000 (GMT)","from forge-stage.sourceware.org (localhost [IPv6:::1])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256)\n (No client certificate requested)\n by forge-stage.sourceware.org (Postfix) with ESMTPS id 90A7D4362B\n for ; Wed, 22 Apr 2026 19:06:36 +0000 (UTC)"],"DKIM-Filter":["OpenDKIM Filter v2.11.0 sourceware.org 6A72C458048F","OpenDKIM Filter v2.11.0 sourceware.org B4C8F441B8F9"],"DMARC-Filter":"OpenDMARC Filter v1.4.2 sourceware.org B4C8F441B8F9","ARC-Filter":"OpenARC Filter v1.0.0 sourceware.org B4C8F441B8F9","ARC-Seal":"i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776884796; cv=none;\n b=sPZ2IPmPUCbTBbtSzhor5i64ITyewPfNHLF0LDaoUiZJFL74aAfYsu7X8dP4dYPNHd2RIi0FLg5U3JLjm4XIsDQ+15HWJ/Y9M9cXjoFYAaCP3SA84jIUWitAeD1Ms+Ht0SELkYrJICTdriLDYmEQQbZvhYASViZQQ6XnVLgi3V0=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=sourceware.org; s=key;\n t=1776884796; c=relaxed/simple;\n bh=C5VDpTK8e9POaSDMwXgbTp+PSEWHxQxIWooHLLMq9Bk=;\n h=From:Date:Subject:MIME-Version:To:Message-ID;\n b=O9Z8UjgR7FUxczlzpdL1JHN3LEJn4NtCBarOUsfizx8lCBUiN2kUZ6THMz2UKoOV626/C8a1v/UA+oWov1G9NIIFf2mVAc0hsYc+JiXZOBHjmUlal0qSg9aMfJe5AWblw6a3MWFQCG4yUc3I59n05BcYC5S+uU9cLnEOLoZQWUY=","ARC-Authentication-Results":"i=1; server2.sourceware.org","From":"=?utf-8?q?Fran=C3=A7ois_Dumont_via_Sourceware_Forge?=\n ","Date":"Wed, 22 Apr 2026 19:05:13 +0000","Subject":"[PATCH v1 1/1] libstdc++: Fix std::erase_if behavior for\n std::__debug::deque","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","To":"gcc-patches mailing list ","Message-ID":"\n ","X-Mailer":"batrachomyomachia","X-Pull-Request-Organization":"gcc","X-Pull-Request-Repository":"gcc-TEST","X-Pull-Request":"https://forge.sourceware.org/gcc/gcc-TEST/pulls/128","References":"\n ","In-Reply-To":"\n ","X-Patch-URL":"\n https://forge.sourceware.org/fdumont/gcc-TEST/commit/371ef411dcbfab7be7fed551d79adba657a39e9c","X-BeenThere":"gcc-patches@gcc.gnu.org","X-Mailman-Version":"2.1.30","Precedence":"list","List-Id":"Gcc-patches mailing list ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Reply-To":"gcc-patches mailing list ,\n fdumont@gcc.gnu.org","Errors-To":"gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org"},"content":"From: François Dumont \n\nstd::erase and std::erase_if are broken for users directly referencing\n__gnu_debug::deque in their code that is to say without activating the\n_GLIBCXX_DEBUG mode. The iterators potentially invalidated by the erase\noperations are not detected by the __gnu_debug::deque container and so\nwon't be reported as invalidated.\n\nWe need explicit std::erase and std::erase_if implementations for\nstd::__debug::deque which will work also when _GLIBCXX_DEBUG mode is\nactivated.\n\nlibstdc++-v3/ChangeLog:\n\n\t* include/debug/deque\n\t(std::erase_if<>(std::__debug::deque<>&, _Pred): New.\n\t(std::erase<>(std::__debug::deque<>&, const _Up&): New.\n\t* include/std/deque (std::erase_if(std::deque<>&, _Pred)): Remove\n\t_GLIBCXX_DEBUG code.\n\t* testsuite/23_containers/deque/debug/erase.cc: New test case.\n\t* testsuite/23_containers/deque/debug/invalidation/erase.cc: New test case.\n---\n libstdc++-v3/include/debug/deque | 28 +++++++++++++++++++\n libstdc++-v3/include/std/deque | 17 +++++------\n .../23_containers/deque/debug/erase.cc | 27 ++++++++++++++++++\n .../deque/debug/invalidation/erase.cc | 28 +++++++++++++++++++\n 4 files changed, 90 insertions(+), 10 deletions(-)\n create mode 100644 libstdc++-v3/testsuite/23_containers/deque/debug/erase.cc\n create mode 100644 libstdc++-v3/testsuite/23_containers/deque/debug/invalidation/erase.cc","diff":"diff --git a/libstdc++-v3/include/debug/deque b/libstdc++-v3/include/debug/deque\nindex ed69eb842e2b..b2e5dd327176 100644\n--- a/libstdc++-v3/include/debug/deque\n+++ b/libstdc++-v3/include/debug/deque\n@@ -771,6 +771,34 @@ namespace __debug\n { __lhs.swap(__rhs); }\n \n } // namespace __debug\n+\n+#ifdef __glibcxx_erase_if // C++ >= 20 && HOSTED\n+_GLIBCXX_BEGIN_NAMESPACE_VERSION\n+ template\n+ inline typename __debug::deque<_Tp, _Alloc>::size_type\n+ erase_if(__debug::deque<_Tp, _Alloc>& __cont, _Predicate __pred)\n+ {\n+ _GLIBCXX_STD_C::deque<_Tp, _Alloc>& __unsafe_cont = __cont;\n+ const auto __osz = __cont.size();\n+ const auto __end = __unsafe_cont.end();\n+ auto __removed = std::__remove_if(__unsafe_cont.begin(), __end,\n+\t\t\t\t\tstd::move(__pred));\n+ if (__removed != __end)\n+\t{\n+\t __cont.erase(__niter_wrap(__cont.begin(), __removed),\n+\t\t __cont.end());\n+\t return __osz - __cont.size();\n+\t}\n+\n+ return 0;\n+ }\n+\n+ template\n+ inline typename __debug::deque<_Tp, _Alloc>::size_type\n+ erase(__debug::deque<_Tp, _Alloc>& __cont, const _Up& __value)\n+ { return std::erase_if(__cont, __gnu_cxx::__ops::__equal_to(__value)); }\n+_GLIBCXX_END_NAMESPACE_VERSION\n+#endif // __cpp_lib_erase_if\n } // namespace std\n \n #endif\ndiff --git a/libstdc++-v3/include/std/deque b/libstdc++-v3/include/std/deque\nindex c82f9dff2869..600f607ac7d3 100644\n--- a/libstdc++-v3/include/std/deque\n+++ b/libstdc++-v3/include/std/deque\n@@ -100,19 +100,16 @@ namespace std _GLIBCXX_VISIBILITY(default)\n _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \n template\n- inline typename deque<_Tp, _Alloc>::size_type\n- erase_if(deque<_Tp, _Alloc>& __cont, _Predicate __pred)\n+ inline typename _GLIBCXX_STD_C::deque<_Tp, _Alloc>::size_type\n+ erase_if(_GLIBCXX_STD_C::deque<_Tp, _Alloc>& __cont, _Predicate __pred)\n {\n- using namespace __gnu_cxx;\n- _GLIBCXX_STD_C::deque<_Tp, _Alloc>& __ucont = __cont;\n const auto __osz = __cont.size();\n- const auto __end = __ucont.end();\n- auto __removed = std::__remove_if(__ucont.begin(), __end,\n+ const auto __end = __cont.end();\n+ auto __removed = std::__remove_if(__cont.begin(), __end,\n \t\t\t\t\tstd::move(__pred));\n if (__removed != __end)\n \t{\n-\t __cont.erase(__niter_wrap(__cont.begin(), __removed),\n-\t\t __cont.end());\n+\t __cont.erase(__removed, __end);\n \t return __osz - __cont.size();\n \t}\n \n@@ -121,8 +118,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \n template\n- inline typename deque<_Tp, _Alloc>::size_type\n- erase(deque<_Tp, _Alloc>& __cont, const _Up& __value)\n+ inline typename _GLIBCXX_STD_C::deque<_Tp, _Alloc>::size_type\n+ erase(_GLIBCXX_STD_C::deque<_Tp, _Alloc>& __cont, const _Up& __value)\n { return std::erase_if(__cont, __gnu_cxx::__ops::__equal_to(__value)); }\n \n _GLIBCXX_END_NAMESPACE_VERSION\ndiff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/erase.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/erase.cc\nnew file mode 100644\nindex 000000000000..d8c36bb11e6c\n--- /dev/null\n+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/erase.cc\n@@ -0,0 +1,27 @@\n+// { dg-do run { target c++20 } }\n+// { dg-require-debug-mode \"\" }\n+\n+#include \n+#include \n+\n+void test01()\n+{\n+ std::deque d;\n+\n+ for (int i = 0; i != 10; ++i)\n+ d.push_back(i);\n+\n+ auto before = d.begin() + 4;\n+ auto last = d.end() - 1;\n+\n+ VERIFY( std::erase(d, 6) == 1 );\n+\n+ VERIFY(before._M_dereferenceable());\n+ VERIFY(last._M_singular());\n+}\n+\n+int main()\n+{\n+ test01();\n+ return 0;\n+}\ndiff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/invalidation/erase.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/invalidation/erase.cc\nnew file mode 100644\nindex 000000000000..c18a5ff4080a\n--- /dev/null\n+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/invalidation/erase.cc\n@@ -0,0 +1,28 @@\n+// { dg-do run { target c++20 } }\n+\n+#include \n+#include \n+\n+using __gnu_debug::deque;\n+\n+void test01()\n+{\n+ deque d;\n+\n+ for (int i = 0; i != 10; ++i)\n+ d.push_back(i);\n+\n+ auto before = d.begin() + 4;\n+ auto last = d.end() -1;\n+\n+ VERIFY( std::erase(d, 6) == 1 );\n+\n+ VERIFY(before._M_dereferenceable());\n+ VERIFY(last._M_singular());\n+}\n+\n+int main()\n+{\n+ test01();\n+ return 0;\n+}\n","prefixes":["v1","1/1"]}