[libcxx-commits] [libcxx] [libc++][tuple][utility] P2968R2 Make `std::ignore` a first-class object (PR #97401)
Hristo Hristov via libcxx-commits
libcxx-commits at lists.llvm.org
Fri Jul 5 04:38:17 PDT 2024
https://github.com/H-G-Hristov updated https://github.com/llvm/llvm-project/pull/97401
>From bd82810eb04cbdfaebeed6ad254831de1b687885 Mon Sep 17 00:00:00 2001
From: Hristo Hristov <hghristov.rmm at gmail.com>
Date: Tue, 2 Jul 2024 10:40:15 +0300
Subject: [PATCH 1/5] [libc++][tuple][utility] P2968R2 Make `std::ignore` a
first-class object
Implements as DR11: https://wg21.link/P2968R2
References:
- https://eel.is/c++draft/tuple.general
- https://eel.is/c++draft/tuple.syn
- https://eel.is/c++draft/tuple.creation
- https://github.com/cplusplus/draft/milestone/31
- https://github.com/cplusplus/papers/issues/1640
- https://cplusplus.github.io/LWG/issue2933
- https://cplusplus.github.io/LWG/issue3978
---
libcxx/docs/ReleaseNotes/19.rst | 1 +
libcxx/include/CMakeLists.txt | 1 +
libcxx/include/__tuple/ignore.h | 32 ++++++++++
libcxx/include/module.modulemap | 1 +
libcxx/include/tuple | 24 +++-----
libcxx/include/utility | 4 ++
.../tuple/tuple.general/ignore.pass.cpp | 61 +++++++++----------
7 files changed, 74 insertions(+), 50 deletions(-)
create mode 100644 libcxx/include/__tuple/ignore.h
diff --git a/libcxx/docs/ReleaseNotes/19.rst b/libcxx/docs/ReleaseNotes/19.rst
index d30021b7eb2347..5c3737d79876e4 100644
--- a/libcxx/docs/ReleaseNotes/19.rst
+++ b/libcxx/docs/ReleaseNotes/19.rst
@@ -46,6 +46,7 @@ Implemented Papers
- P2872R3 - Remove ``wstring_convert`` From C++26
- P3142R0 - Printing Blank Lines with ``println`` (as DR against C++23)
- P2944R3 - Comparisons for ``reference_wrapper`` (comparison operators for ``reference_wrapper`` only)
+- P2968R2 - Make ``std::ignore`` a first-class object (as DR against C++11)
- P2302R4 - ``std::ranges::contains``
- P1659R3 - ``std::ranges::starts_with`` and ``std::ranges::ends_with``
- P3029R1 - Better ``mdspan``'s CTAD
diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt
index 8d0ffd6ed725bd..07dd25604a9c76 100644
--- a/libcxx/include/CMakeLists.txt
+++ b/libcxx/include/CMakeLists.txt
@@ -710,6 +710,7 @@ set(files
__thread/timed_backoff_policy.h
__tree
__tuple/find_index.h
+ __tuple/ignore.h
__tuple/make_tuple_types.h
__tuple/sfinae_helpers.h
__tuple/tuple_element.h
diff --git a/libcxx/include/__tuple/ignore.h b/libcxx/include/__tuple/ignore.h
new file mode 100644
index 00000000000000..2ddc850efccb39
--- /dev/null
+++ b/libcxx/include/__tuple/ignore.h
@@ -0,0 +1,32 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP___TUPLE_IGNORE_H
+#define _LIBCPP___TUPLE_IGNORE_H
+
+#include <__config>
+
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+# pragma GCC system_header
+#endif
+
+#ifndef _LIBCPP_CXX03_LANG
+
+_LIBCPP_BEGIN_NAMESPACE_STD
+
+struct __ignore_type {
+ _LIBCPP_HIDE_FROM_ABI constexpr const __ignore_type& operator=(const auto&) const noexcept { return *this; }
+};
+
+inline constexpr __ignore_type ignore;
+
+_LIBCPP_END_NAMESPACE_STD
+
+#endif // _LIBCPP_CXX03_LANG
+
+#endif // _LIBCPP___TUPLE_IGNORE_H
diff --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap
index 9ffccf66ff0948..4ad506781c489a 100644
--- a/libcxx/include/module.modulemap
+++ b/libcxx/include/module.modulemap
@@ -1840,6 +1840,7 @@ module std_private_thread_thread [system] {
module std_private_thread_timed_backoff_policy [system] { header "__thread/timed_backoff_policy.h" }
module std_private_tuple_find_index [system] { header "__tuple/find_index.h" }
+module std_private_tuple_ignore [system] { header "__tuple/ignore.h" }
module std_private_tuple_make_tuple_types [system] { header "__tuple/make_tuple_types.h" }
module std_private_tuple_tuple_like_no_subrange [system] {
header "__tuple/tuple_like_no_subrange.h"
diff --git a/libcxx/include/tuple b/libcxx/include/tuple
index 26652ffe81e9f0..d2f6e19ede68df 100644
--- a/libcxx/include/tuple
+++ b/libcxx/include/tuple
@@ -132,7 +132,12 @@ tuple(allocator_arg_t, Alloc, pair<T1, T2>) -> tuple<T1, T2>; // since C++
template <class Alloc, class ...T>
tuple(allocator_arg_t, Alloc, tuple<T...>) -> tuple<T...>; // since C++17
-inline constexpr unspecified ignore;
++struct ignore-type { // exposition only
++ constexpr const ignore-type&
++ operator=(const auto &) const noexcept
++ { return *this; }
++};
+inline constexpr ignore-type ignore;
template <class... T> tuple<V...> make_tuple(T&&...); // constexpr in C++14
template <class... T> tuple<ATypes...> forward_as_tuple(T&&...) noexcept; // constexpr in C++14
@@ -215,6 +220,7 @@ template <class... Types>
#include <__memory/allocator_arg_t.h>
#include <__memory/uses_allocator.h>
#include <__tuple/find_index.h>
+#include <__tuple/ignore.h>
#include <__tuple/make_tuple_types.h>
#include <__tuple/sfinae_helpers.h>
#include <__tuple/tuple_element.h>
@@ -1112,22 +1118,6 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 tuple<_Tp&...> tie(_T
return tuple<_Tp&...>(__t...);
}
-template <class _Up>
-struct __ignore_t {
- template <class _Tp>
- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 const __ignore_t& operator=(_Tp&&) const {
- return *this;
- }
-};
-
-# if _LIBCPP_STD_VER >= 17
-inline constexpr __ignore_t<unsigned char> ignore = __ignore_t<unsigned char>();
-# else
-namespace {
-constexpr __ignore_t<unsigned char> ignore = __ignore_t<unsigned char>();
-} // namespace
-# endif
-
template <class... _Tp>
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 tuple<typename __unwrap_ref_decay<_Tp>::type...>
make_tuple(_Tp&&... __t) {
diff --git a/libcxx/include/utility b/libcxx/include/utility
index 90713da621c5da..f2f0052df27552 100644
--- a/libcxx/include/utility
+++ b/libcxx/include/utility
@@ -274,6 +274,10 @@ template <class T>
#include <compare>
#include <initializer_list>
+// [tuple.creation]
+
+#include <__tuple/ignore.h>
+
// [tuple.helper]
#include <__tuple/tuple_element.h>
#include <__tuple/tuple_size.h>
diff --git a/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp
index 769c55e10fc438..a3e62e83bcdc92 100644
--- a/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-// <tuple>
+// UNSUPPORTED: c++03
-// constexpr unspecified ignore;
+// <tuple>
-// UNSUPPORTED: c++03
+// inline constexpr ignore-type ignore;
#include <cassert>
#include <tuple>
@@ -18,39 +18,34 @@
#include "test_macros.h"
-constexpr bool test_ignore_constexpr()
-{
-#if TEST_STD_VER > 11
- { // Test that std::ignore provides constexpr converting assignment.
- auto& res = (std::ignore = 42);
- assert(&res == &std::ignore);
- }
- { // Test that std::ignore provides constexpr copy/move constructors
- auto copy = std::ignore;
- auto moved = std::move(copy);
- ((void)moved);
- }
- { // Test that std::ignore provides constexpr copy/move assignment
- auto copy = std::ignore;
- copy = std::ignore;
- auto moved = std::ignore;
- moved = std::move(copy);
- }
-#endif
- return true;
+constexpr bool test() {
+ {
+ constexpr auto& ignore_v = std::ignore;
+ ((void)ignore_v);
+ }
+ { // Test that std::ignore provides constexpr converting assignment.
+ auto& res = (std::ignore = 42);
+ assert(&res == &std::ignore);
+ }
+ { // Test that std::ignore provides constexpr copy/move constructors
+ auto copy = (std::ignore = 42);
+ auto moved = std::move(copy);
+ ((void)moved);
+ }
+ { // Test that std::ignore provides constexpr copy/move assignment
+ auto copy = (std::ignore = 82);
+ copy = std::ignore;
+ auto moved = (std::ignore = 94);
+ moved = std::move(copy);
+ }
+
+ return true;
}
int main(int, char**) {
- {
- constexpr auto& ignore_v = std::ignore;
- ((void)ignore_v);
- }
- {
- static_assert(test_ignore_constexpr(), "");
- }
- {
- LIBCPP_STATIC_ASSERT(std::is_trivial<decltype(std::ignore)>::value, "");
- }
+ test();
+ static_assert(test(), "");
+ LIBCPP_STATIC_ASSERT(std::is_trivial<decltype(std::ignore)>::value, "");
return 0;
}
>From 1aa5e01df162a3cae796cceffb45ca5aa178f3d5 Mon Sep 17 00:00:00 2001
From: Hristo Hristov <hghristov.rmm at gmail.com>
Date: Wed, 3 Jul 2024 07:27:21 +0300
Subject: [PATCH 2/5] Fixed C++11
---
libcxx/include/__tuple/ignore.h | 3 +-
.../tuple/tuple.general/ignore.pass.cpp | 33 ++++++++++++++++---
2 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/libcxx/include/__tuple/ignore.h b/libcxx/include/__tuple/ignore.h
index 2ddc850efccb39..a8261de7d73b4f 100644
--- a/libcxx/include/__tuple/ignore.h
+++ b/libcxx/include/__tuple/ignore.h
@@ -20,7 +20,8 @@
_LIBCPP_BEGIN_NAMESPACE_STD
struct __ignore_type {
- _LIBCPP_HIDE_FROM_ABI constexpr const __ignore_type& operator=(const auto&) const noexcept { return *this; }
+ template <class _Tp>
+ _LIBCPP_HIDE_FROM_ABI constexpr const __ignore_type& operator=(const _Tp&) const noexcept { return *this; }
};
inline constexpr __ignore_type ignore;
diff --git a/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp
index a3e62e83bcdc92..34a7607b82afc2 100644
--- a/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp
@@ -18,13 +18,38 @@
#include "test_macros.h"
-constexpr bool test() {
+static_assert(std::is_trivial<decltype(std::ignore)>::value, "");
+
+void test() {
+ {
+ [[maybe_unused]] constexpr auto& ignore_v = std::ignore;
+ }
+ { // Test that std::ignore provides constexpr converting assignment.
+ constexpr auto& res = (std::ignore = 42);
+ static_assert(noexcept(res = (std::ignore = 42)), "Must be noexcept");
+ assert(&res == &std::ignore);
+ }
+ { // Test that std::ignore provides constexpr copy/move constructors
+ constexpr auto copy = std::ignore;
+ [[maybe_unused]] constexpr auto moved = std::move(copy);
+ }
+ { // Test that std::ignore provides constexpr copy/move assignment
+ constexpr auto copy = std::ignore;
+ copy = std::ignore;
+ constexpr auto moved = std::ignore;
+ moved = std::move(copy);
+ }
+}
+
+constexpr bool test_constexpr() {
+#if TEST_STD_VER >= 14
{
- constexpr auto& ignore_v = std::ignore;
+ auto& ignore_v = std::ignore;
((void)ignore_v);
}
{ // Test that std::ignore provides constexpr converting assignment.
auto& res = (std::ignore = 42);
+ static_assert(noexcept(res = (std::ignore = 42)), "Must be noexcept");
assert(&res == &std::ignore);
}
{ // Test that std::ignore provides constexpr copy/move constructors
@@ -38,14 +63,14 @@ constexpr bool test() {
auto moved = (std::ignore = 94);
moved = std::move(copy);
}
+#endif
return true;
}
int main(int, char**) {
test();
- static_assert(test(), "");
- LIBCPP_STATIC_ASSERT(std::is_trivial<decltype(std::ignore)>::value, "");
+ static_assert(test_constexpr(), "");
return 0;
}
>From cf0e266a02ab7cba91caeb9377eae7d454ca28ce Mon Sep 17 00:00:00 2001
From: Hristo Hristov <hghristov.rmm at gmail.com>
Date: Wed, 3 Jul 2024 07:29:38 +0300
Subject: [PATCH 3/5] Updated test
---
.../tuple/tuple.general/ignore.pass.cpp | 42 ++-----------------
1 file changed, 4 insertions(+), 38 deletions(-)
diff --git a/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp
index 34a7607b82afc2..22b7b2fdebe413 100644
--- a/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp
@@ -18,19 +18,17 @@
#include "test_macros.h"
-static_assert(std::is_trivial<decltype(std::ignore)>::value, "");
+int main(int, char**) {
+ static_assert(std::is_trivial<decltype(std::ignore)>::value, "");
-void test() {
- {
- [[maybe_unused]] constexpr auto& ignore_v = std::ignore;
- }
+ { [[maybe_unused]] constexpr auto& ignore_v = std::ignore; }
{ // Test that std::ignore provides constexpr converting assignment.
constexpr auto& res = (std::ignore = 42);
static_assert(noexcept(res = (std::ignore = 42)), "Must be noexcept");
assert(&res == &std::ignore);
}
{ // Test that std::ignore provides constexpr copy/move constructors
- constexpr auto copy = std::ignore;
+ constexpr auto copy = std::ignore;
[[maybe_unused]] constexpr auto moved = std::move(copy);
}
{ // Test that std::ignore provides constexpr copy/move assignment
@@ -39,38 +37,6 @@ void test() {
constexpr auto moved = std::ignore;
moved = std::move(copy);
}
-}
-
-constexpr bool test_constexpr() {
-#if TEST_STD_VER >= 14
- {
- auto& ignore_v = std::ignore;
- ((void)ignore_v);
- }
- { // Test that std::ignore provides constexpr converting assignment.
- auto& res = (std::ignore = 42);
- static_assert(noexcept(res = (std::ignore = 42)), "Must be noexcept");
- assert(&res == &std::ignore);
- }
- { // Test that std::ignore provides constexpr copy/move constructors
- auto copy = (std::ignore = 42);
- auto moved = std::move(copy);
- ((void)moved);
- }
- { // Test that std::ignore provides constexpr copy/move assignment
- auto copy = (std::ignore = 82);
- copy = std::ignore;
- auto moved = (std::ignore = 94);
- moved = std::move(copy);
- }
-#endif
-
- return true;
-}
-
-int main(int, char**) {
- test();
- static_assert(test_constexpr(), "");
return 0;
}
>From dd7e8385dc03bea603a3f8bec41cc76165f04a4e Mon Sep 17 00:00:00 2001
From: Hristo Hristov <hghristov.rmm at gmail.com>
Date: Wed, 3 Jul 2024 07:52:08 +0300
Subject: [PATCH 4/5] Formatting
---
libcxx/include/__tuple/ignore.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libcxx/include/__tuple/ignore.h b/libcxx/include/__tuple/ignore.h
index a8261de7d73b4f..a00fc7e7d5b85e 100644
--- a/libcxx/include/__tuple/ignore.h
+++ b/libcxx/include/__tuple/ignore.h
@@ -21,7 +21,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD
struct __ignore_type {
template <class _Tp>
- _LIBCPP_HIDE_FROM_ABI constexpr const __ignore_type& operator=(const _Tp&) const noexcept { return *this; }
+ _LIBCPP_HIDE_FROM_ABI constexpr const __ignore_type& operator=(const _Tp&) const noexcept {
+ return *this;
+ }
};
inline constexpr __ignore_type ignore;
>From 99900ba54551053177daefb8def4e1b74f321915 Mon Sep 17 00:00:00 2001
From: Hristo Hristov <hghristov.rmm at gmail.com>
Date: Fri, 5 Jul 2024 14:36:40 +0300
Subject: [PATCH 5/5] Updated tests
---
.../tuple/tuple.general/ignore.pass.cpp | 26 ++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp
index 22b7b2fdebe413..49f3249a4e413a 100644
--- a/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp
@@ -13,13 +13,29 @@
// inline constexpr ignore-type ignore;
#include <cassert>
+#include <cstdint>
#include <tuple>
#include <type_traits>
#include "test_macros.h"
+static_assert(std::is_trivial<decltype(std::ignore)>::value, "");
+
+#if TEST_STD_VER >= 17
+[[nodiscard]] constexpr int test_nodiscard() { return 8294; }
+#endif
+
+constexpr bool test() {
+#if TEST_STD_VER >= 17
+ { std::ignore = test_nodiscard(); }
+#endif
+
+ return true;
+}
+
int main(int, char**) {
- static_assert(std::is_trivial<decltype(std::ignore)>::value, "");
+ test();
+ static_assert(test(), "");
{ [[maybe_unused]] constexpr auto& ignore_v = std::ignore; }
{ // Test that std::ignore provides constexpr converting assignment.
@@ -27,6 +43,14 @@ int main(int, char**) {
static_assert(noexcept(res = (std::ignore = 42)), "Must be noexcept");
assert(&res == &std::ignore);
}
+ { // Test bit-field binding.
+ struct S {
+ unsigned int bf : 3;
+ };
+ constexpr S s{0b010};
+ constexpr auto& res = (std::ignore = s.bf);
+ assert(&res == &std::ignore);
+ }
{ // Test that std::ignore provides constexpr copy/move constructors
constexpr auto copy = std::ignore;
[[maybe_unused]] constexpr auto moved = std::move(copy);
More information about the libcxx-commits
mailing list