{"id":2226786,"url":"http://patchwork.ozlabs.org/api/patches/2226786/?format=json","web_url":"http://patchwork.ozlabs.org/project/gcc/patch/bmm.hhupath8dc.gcc.gcc-TEST.tkaminsk.107.1.7@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":"<bmm.hhupath8dc.gcc.gcc-TEST.tkaminsk.107.1.7@forge-stage.sourceware.org>","list_archive_url":null,"date":"2026-04-22T18:55:23","name":"[v1,07/13] Tests and fix for accessors","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"33905c099c897d677d9ce8c328d47f580537ffc6","submitter":{"id":93223,"url":"http://patchwork.ozlabs.org/api/people/93223/?format=json","name":"tkaminsk via Sourceware Forge","email":"forge-bot+tkaminsk@forge-stage.sourceware.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/gcc/patch/bmm.hhupath8dc.gcc.gcc-TEST.tkaminsk.107.1.7@forge-stage.sourceware.org/mbox/","series":[{"id":501097,"url":"http://patchwork.ozlabs.org/api/series/501097/?format=json","web_url":"http://patchwork.ozlabs.org/project/gcc/list/?series=501097","date":"2026-04-22T18:55:20","name":"libstdc++: optional<T&> (P2988R12)","version":1,"mbox":"http://patchwork.ozlabs.org/series/501097/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2226786/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226786/checks/","tags":{},"related":[],"headers":{"Return-Path":"<gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org>","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 4g18zZ4F7Sz1y2d\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 23 Apr 2026 05:53:30 +1000 (AEST)","from vm01.sourceware.org (localhost [127.0.0.1])\n\tby sourceware.org (Postfix) with ESMTP id 9935143932D0\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 19:53:28 +0000 (GMT)","from forge-stage.sourceware.org (vm08.sourceware.org [38.145.34.39])\n by sourceware.org (Postfix) with ESMTPS id AFEF040986D3\n for <gcc-patches@gcc.gnu.org>; Wed, 22 Apr 2026 18:56:25 +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 4A874435B8\n for <gcc-patches@gcc.gnu.org>; Wed, 22 Apr 2026 18:56:23 +0000 (UTC)"],"DKIM-Filter":["OpenDKIM Filter v2.11.0 sourceware.org 9935143932D0","OpenDKIM Filter v2.11.0 sourceware.org AFEF040986D3"],"DMARC-Filter":"OpenDMARC Filter v1.4.2 sourceware.org AFEF040986D3","ARC-Filter":"OpenARC Filter v1.0.0 sourceware.org AFEF040986D3","ARC-Seal":"i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776884185; cv=none;\n b=R3FMR0MBsCml4BdEJ4ZTp8uXbiLrkEfAZsncAC1z+fLSu/t19sMq3HMhsJmJukLR7/BAejHlb6K2dElr+yXj9kffKzXYOqFqO6pZYCrtTEyblw4d7AN6nzIm3O3R9muUm9IXVkmDwzolPtfrD4ZMRaFiyV5wlZ2vC0jXQQDOBMs=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=sourceware.org; s=key;\n t=1776884185; c=relaxed/simple;\n bh=waVRwnayZYjSnd8R+ERFWB4aNxOFRJlNdkdJL3ZnzMs=;\n h=From:Date:Subject:MIME-Version:To:Message-ID;\n b=mvXe7CgvrwzLh/Z2nVWFAhbap5FRuy4axlFOQ84kRmlxtANVU9OLBQo/rmaTKMhSLIZHUs42tOe32zXgqqG0MeIZmkayarmZ2l3ElWfwnO2yXbJ7QN0vE0ZlokkdWFvyHwKD5hjdBef1+6T1VC+LJ3Qpr2/euvQ0nywzLc1LgrA=","ARC-Authentication-Results":"i=1; server2.sourceware.org","From":"tkaminsk via Sourceware Forge\n <forge-bot+tkaminsk@forge-stage.sourceware.org>","Date":"Wed, 22 Apr 2026 18:55:23 +0000","Subject":"[PATCH v1 07/13] Tests and fix for accessors","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","To":"gcc-patches mailing list <gcc-patches@gcc.gnu.org>","Message-ID":"\n <bmm.hhupath8dc.gcc.gcc-TEST.tkaminsk.107.1.7@forge-stage.sourceware.org>","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/107","References":"\n <bmm.hhupath8dc.gcc.gcc-TEST.tkaminsk.107.1.0@forge-stage.sourceware.org>","In-Reply-To":"\n <bmm.hhupath8dc.gcc.gcc-TEST.tkaminsk.107.1.0@forge-stage.sourceware.org>","X-Patch-URL":"\n https://forge.sourceware.org/tkaminsk/gcc/commit/a4d61c8c4e732d574f26643310a255881ca26df6","X-BeenThere":"gcc-patches@gcc.gnu.org","X-Mailman-Version":"2.1.30","Precedence":"list","List-Id":"Gcc-patches mailing list <gcc-patches.gcc.gnu.org>","List-Unsubscribe":"<https://gcc.gnu.org/mailman/options/gcc-patches>,\n <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe>","List-Archive":"<https://gcc.gnu.org/pipermail/gcc-patches/>","List-Post":"<mailto:gcc-patches@gcc.gnu.org>","List-Help":"<mailto:gcc-patches-request@gcc.gnu.org?subject=help>","List-Subscribe":"<https://gcc.gnu.org/mailman/listinfo/gcc-patches>,\n <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe>","Reply-To":"gcc-patches mailing list <gcc-patches@gcc.gnu.org>,\n tkaminsk@gcc.gnu.org","Errors-To":"gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org"},"content":"From: Tomasz Kamiński <tkaminsk@redhat.com>\n\n---\n libstdc++-v3/include/std/optional             |   2 +-\n .../testsuite/20_util/optional/ref/access.cc  | 119 ++++++++++++++++++\n 2 files changed, 120 insertions(+), 1 deletion(-)\n create mode 100644 libstdc++-v3/testsuite/20_util/optional/ref/access.cc","diff":"diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional\nindex fc39127a3e26..9a6a45bbfb03 100644\n--- a/libstdc++-v3/include/std/optional\n+++ b/libstdc++-v3/include/std/optional\n@@ -1676,7 +1676,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n       // _GLIBCXX_RESOLVE_LIB_DEFECTS\n       // 4304. std::optional<NonReturnable&> is ill-formed due to value_or\n       template<typename _Up = remove_cv_t<_Tp>>\n-        requires (!is_array_v<_Tp>)\n+        requires is_object_v<_Tp> && (!is_array_v<_Tp>)\n \tconstexpr decay_t<_Tp>\n \tvalue_or(_Up&& __u) const\n \t{\ndiff --git a/libstdc++-v3/testsuite/20_util/optional/ref/access.cc b/libstdc++-v3/testsuite/20_util/optional/ref/access.cc\nnew file mode 100644\nindex 000000000000..60ecf9301c4f\n--- /dev/null\n+++ b/libstdc++-v3/testsuite/20_util/optional/ref/access.cc\n@@ -0,0 +1,119 @@\n+// { dg-do run { target c++26 }  }\n+\n+#include <optional>\n+#include <type_traits>\n+#include <testsuite_hooks.h>\n+\n+struct NonMovable\n+{\n+  constexpr NonMovable() {}\n+  NonMovable(NonMovable&&) = delete;\n+};\n+\n+template<typename T>\n+constexpr \n+void test_value(T& t)\n+{\n+  std::optional<T&> o1(t);\n+  const std::optional<T&> co1(t);\n+\n+  static_assert( std::is_same_v<decltype(o1.value()), T&> );\n+  VERIFY( &o1.value() == &t );\n+\n+  static_assert( std::is_same_v<decltype(co1.value()), T&> );\n+  VERIFY( &co1.value() == &t );\n+\n+  static_assert( std::is_same_v<decltype(std::move(o1).value()), T&> );\n+  VERIFY( &std::move(o1).value() == &t );\n+\n+  static_assert( std::is_same_v<decltype(std::move(co1).value()), T&> );\n+  VERIFY( &std::move(co1).value() == &t );\n+\n+  std::optional<const T&> o2(t);\n+  static_assert( std::is_same_v<decltype(o2.value()), const T&> );\n+  VERIFY( &o2.value() == &t );\n+}\n+\n+struct Tracker\n+{\n+  int copy = 0;\n+  int move = 0;\n+\n+  constexpr Tracker(int v) : copy(v), move(v) {}\n+\n+  constexpr Tracker(Tracker const& o)\n+  : copy(o.copy+1), move(o.move)\n+  {}\n+\n+  constexpr Tracker(Tracker&& o)\n+  : copy(o.copy), move(o.move+1)\n+  {}\n+\n+  Tracker& operator=(Tracker) = delete;\n+};\n+\n+constexpr\n+void test_value_or()\n+{\n+  Tracker t(100), u(200);\n+  std::optional<Tracker&> o(t);\n+\n+  Tracker r1 = o.value_or(u);\n+  VERIFY( r1.copy == 101 );\n+  VERIFY( r1.move == 100 );\n+  Tracker r2 = o.value_or(std::move(u));\n+  VERIFY( r2.copy == 101 );\n+  VERIFY( r2.move == 100 );\n+  Tracker r3 = std::move(o).value_or(u);\n+  VERIFY( r3.copy == 101 );\n+  VERIFY( r3.move == 100 );\n+  Tracker r4 = std::move(o).value_or(std::move(u));\n+  VERIFY( r4.copy == 101 );\n+  VERIFY( r4.move == 100 );\n+\n+  o.reset();\n+  Tracker r5 = o.value_or(u);\n+  VERIFY( r5.copy == 201 );\n+  VERIFY( r5.move == 200 );\n+  Tracker r6 = o.value_or(std::move(u));\n+  VERIFY( r6.copy == 200 );\n+  VERIFY( r6.move == 201 );\n+  Tracker r7 = std::move(o).value_or(u);\n+  VERIFY( r7.copy == 201 );\n+  VERIFY( r7.move == 200 );\n+  Tracker r8 = std::move(o).value_or(std::move(u));\n+  VERIFY( r8.copy == 200 );\n+  VERIFY( r8.move == 201 );\n+}\n+\n+template<typename T>\n+concept has_value_or_for = requires(std::optional<T&> t, T& u)\n+{ t.value_or(u); };\n+\n+static_assert(  has_value_or_for<int> );\n+static_assert(  has_value_or_for<NonMovable> );\n+static_assert( !has_value_or_for<int[2]> );\n+static_assert(  has_value_or_for<int(*)[2]> );\n+static_assert( !has_value_or_for<int()> );\n+static_assert(  has_value_or_for<int(*)()> );\n+\n+int i;\n+NonMovable nm;\n+int arr[2];\n+int foo();\n+\n+int main()\n+{\n+  auto test_all = [] {\n+    test_value<int>(i);\n+    test_value<NonMovable>(nm);\n+    test_value<int[2]>(arr);\n+    test_value<int()>(foo);\n+\n+    test_value_or();\n+    return true;\n+  };\n+\n+  test_all();\n+  static_assert(test_all());\n+}\n","prefixes":["v1","07/13"]}