[libcxx-commits] [libcxx] [libc++] fixing missing forward declarations of uses_allocator_construction_args (PR #67044)
via libcxx-commits
libcxx-commits at lists.llvm.org
Mon Jan 22 08:03:20 PST 2024
https://github.com/phyBrackets updated https://github.com/llvm/llvm-project/pull/67044
>From fb4434db4a6993a7592e70f20e4f71f02dfbc9a3 Mon Sep 17 00:00:00 2001
From: Shivam Kunwar <shivam.kunwar at kdab.com>
Date: Thu, 21 Sep 2023 22:52:42 +0530
Subject: [PATCH 1/4] forward declarations for
__uses_allocator_construction_args
---
.../__memory/uses_allocator_construction.h | 38 +++++++++++--
.../uses_allocator_construction_args.pass.cpp | 55 +++++++++++++++++++
libcxx/utils/data/ignore_format.txt | 1 +
3 files changed, 88 insertions(+), 6 deletions(-)
diff --git a/libcxx/include/__memory/uses_allocator_construction.h b/libcxx/include/__memory/uses_allocator_construction.h
index 71ae5bcd323315..90e4e5db772997 100644
--- a/libcxx/include/__memory/uses_allocator_construction.h
+++ b/libcxx/include/__memory/uses_allocator_construction.h
@@ -58,6 +58,32 @@ __uses_allocator_construction_args(const _Alloc& __alloc, _Args&&... __args) noe
}
template <class _Pair, class _Alloc, class _Tuple1, class _Tuple2, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+_LIBCPP_HIDE_FROM_ABI constexpr auto
+__uses_allocator_construction_args(const _Alloc& __a, piecewise_construct_t, _Tuple1&& __x, _Tuple2&& __y) noexcept;
+
+template <class _Pair, class _Alloc, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+_LIBCPP_HIDE_FROM_ABI constexpr auto __uses_allocator_construction_args(const _Alloc&) noexcept;
+
+template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+_LIBCPP_HIDE_FROM_ABI constexpr auto __uses_allocator_construction_args(const _Alloc&, _Up&&, _Vp&&) noexcept;
+
+template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+_LIBCPP_HIDE_FROM_ABI constexpr auto
+__uses_allocator_construction_args(const _Alloc& __alloc, pair<_Up, _Vp>& __pair) noexcept;
+
+template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+_LIBCPP_HIDE_FROM_ABI constexpr auto
+__uses_allocator_construction_args(const _Alloc& __alloc, const pair<_Up, _Vp>& __pair) noexcept;
+
+template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+_LIBCPP_HIDE_FROM_ABI constexpr auto
+__uses_allocator_construction_args(const _Alloc& __alloc, pair<_Up, _Vp>&& __pair) noexcept;
+
+template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+_LIBCPP_HIDE_FROM_ABI constexpr auto
+__uses_allocator_construction_args(const _Alloc& __alloc, const pair<_Up, _Vp>&& __pair) noexcept;
+
+template <class _Pair, class _Alloc, class _Tuple1, class _Tuple2, __enable_if_t<__is_cv_std_pair<_Pair>, int>>
_LIBCPP_HIDE_FROM_ABI constexpr auto __uses_allocator_construction_args(
const _Alloc& __alloc, piecewise_construct_t, _Tuple1&& __x, _Tuple2&& __y) noexcept {
return std::make_tuple(
@@ -76,12 +102,12 @@ _LIBCPP_HIDE_FROM_ABI constexpr auto __uses_allocator_construction_args(
std::forward<_Tuple2>(__y)));
}
-template <class _Pair, class _Alloc, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+template <class _Pair, class _Alloc, __enable_if_t<__is_cv_std_pair<_Pair>, int>>
_LIBCPP_HIDE_FROM_ABI constexpr auto __uses_allocator_construction_args(const _Alloc& __alloc) noexcept {
return std::__uses_allocator_construction_args<_Pair>(__alloc, piecewise_construct, tuple<>{}, tuple<>{});
}
-template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int>>
_LIBCPP_HIDE_FROM_ABI constexpr auto
__uses_allocator_construction_args(const _Alloc& __alloc, _Up&& __u, _Vp&& __v) noexcept {
return std::__uses_allocator_construction_args<_Pair>(
@@ -92,7 +118,7 @@ __uses_allocator_construction_args(const _Alloc& __alloc, _Up&& __u, _Vp&& __v)
}
# if _LIBCPP_STD_VER >= 23
-template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int>>
_LIBCPP_HIDE_FROM_ABI constexpr auto
__uses_allocator_construction_args(const _Alloc& __alloc, pair<_Up, _Vp>& __pair) noexcept {
return std::__uses_allocator_construction_args<_Pair>(
@@ -100,14 +126,14 @@ __uses_allocator_construction_args(const _Alloc& __alloc, pair<_Up, _Vp>& __pair
}
# endif
-template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int>>
_LIBCPP_HIDE_FROM_ABI constexpr auto
__uses_allocator_construction_args(const _Alloc& __alloc, const pair<_Up, _Vp>& __pair) noexcept {
return std::__uses_allocator_construction_args<_Pair>(
__alloc, piecewise_construct, std::forward_as_tuple(__pair.first), std::forward_as_tuple(__pair.second));
}
-template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int>>
_LIBCPP_HIDE_FROM_ABI constexpr auto
__uses_allocator_construction_args(const _Alloc& __alloc, pair<_Up, _Vp>&& __pair) noexcept {
return std::__uses_allocator_construction_args<_Pair>(
@@ -118,7 +144,7 @@ __uses_allocator_construction_args(const _Alloc& __alloc, pair<_Up, _Vp>&& __pai
}
# if _LIBCPP_STD_VER >= 23
-template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int> = 0>
+template <class _Pair, class _Alloc, class _Up, class _Vp, __enable_if_t<__is_cv_std_pair<_Pair>, int>>
_LIBCPP_HIDE_FROM_ABI constexpr auto
__uses_allocator_construction_args(const _Alloc& __alloc, const pair<_Up, _Vp>&& __pair) noexcept {
return std::__uses_allocator_construction_args<_Pair>(
diff --git a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp b/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
index ab3c039497dd95..5a7c59e448022e 100644
--- a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
+++ b/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
@@ -121,6 +121,61 @@ constexpr void testOne() {
assert(std::get<2>(std::get<1>(ret)) == 3);
assert(std::get<0>(std::get<2>(ret)) == 4);
}
+ {
+ // Tests for ensuring forward declarations of uses_allocator_construction_args
+ {
+ using NestedPairType = std::pair<int, std::pair<int, UsesAllocArgT>>;
+ std::same_as<std::tuple<
+ std::piecewise_construct_t,
+ std::tuple<>,
+ std::tuple<std::piecewise_construct_t, std::tuple<>, std::tuple<std::allocator_arg_t, const Alloc&>>>> auto
+ ret = test_uses_allocator_construction_args<NestedPairType>(a);
+ (void)ret;
+ }
+ {
+ using NestedPairType = std::pair<int, std::pair<UsesAllocArgT, int>>;
+ std::same_as<std::tuple<
+ std::piecewise_construct_t,
+ std::tuple<>,
+ std::tuple<std::piecewise_construct_t, std::tuple<std::allocator_arg_t, const Alloc&>, std::tuple<>>>> auto
+ ret = test_uses_allocator_construction_args<NestedPairType>(a);
+ (void)ret;
+ }
+ {
+ using PairType = std::pair<int, int>;
+ int up = 1;
+ int vp = 2;
+
+ std::same_as<std::tuple<std::piecewise_construct_t, std::tuple<int&&>, std::tuple<int&&>>> auto ret =
+ test_uses_allocator_construction_args<PairType>(a, std::move(up), std::move(vp));
+ (void)ret;
+ }
+ {
+ using PairType = const std::pair<int, int>;
+ PairType p(1, 2);
+
+ std::same_as<std::tuple<std::piecewise_construct_t, std::tuple<const int&>, std::tuple<const int&>>> auto ret =
+ test_uses_allocator_construction_args<PairType>(a, p);
+ (void)ret;
+ }
+ {
+ using PairType = std::pair<int, int>;
+ PairType p(1, 2);
+
+ std::same_as<std::tuple<std::piecewise_construct_t, std::tuple<int&&>, std::tuple<int&&>>> auto ret =
+ test_uses_allocator_construction_args<PairType>(a, std::move(p));
+ (void)ret;
+ }
+ {
+ using PairType = const std::pair<int, int>;
+ PairType p(1, 2);
+
+ std::same_as<std::tuple<std::piecewise_construct_t, std::tuple<const int&&>, std::tuple<const int&&>>> auto ret =
+ test_uses_allocator_construction_args<PairType>(a, std::move(p));
+ (void)ret;
+ }
+ }
+}
#if TEST_STD_VER >= 23
{
std::pair p{3, 4};
diff --git a/libcxx/utils/data/ignore_format.txt b/libcxx/utils/data/ignore_format.txt
index 1d0a6b0b7ef5f8..8f929c2c0a2365 100644
--- a/libcxx/utils/data/ignore_format.txt
+++ b/libcxx/utils/data/ignore_format.txt
@@ -6512,6 +6512,7 @@ libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/void_po
libcxx/test/std/utilities/memory/allocator.traits/allocator_type.pass.cpp
libcxx/test/std/utilities/memory/allocator.traits/rebind_traits.pass.cpp
libcxx/test/std/utilities/memory/allocator.traits/value_type.pass.cpp
+libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp
libcxx/test/std/utilities/memory/c.malloc/nothing_to_do.pass.cpp
libcxx/test/std/utilities/memory/default.allocator/allocator.ctor.pass.cpp
>From 5b7a309cc6fe1feba1eddba16f077570df26d6e5 Mon Sep 17 00:00:00 2001
From: Shivam Kunwar <shivam.kunwar at kdab.com>
Date: Thu, 28 Dec 2023 12:57:36 +0530
Subject: [PATCH 2/4] fix the ci issue
---
.../uses_allocator_construction_args.pass.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp b/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
index 5a7c59e448022e..e7f0c4afa5aed2 100644
--- a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
+++ b/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
@@ -168,14 +168,13 @@ constexpr void testOne() {
}
{
using PairType = const std::pair<int, int>;
- PairType p(1, 2);
+ const PairType p(1, 2);
std::same_as<std::tuple<std::piecewise_construct_t, std::tuple<const int&&>, std::tuple<const int&&>>> auto ret =
test_uses_allocator_construction_args<PairType>(a, std::move(p));
(void)ret;
}
}
-}
#if TEST_STD_VER >= 23
{
std::pair p{3, 4};
>From 1527b607b0557a7f9015c3669c8e42581e6cf70a Mon Sep 17 00:00:00 2001
From: Shivam <75530356+phyBrackets at users.noreply.github.com>
Date: Mon, 1 Jan 2024 15:47:36 +0530
Subject: [PATCH 3/4] Update ignore_format.txt
---
libcxx/utils/data/ignore_format.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/libcxx/utils/data/ignore_format.txt b/libcxx/utils/data/ignore_format.txt
index 8f929c2c0a2365..1d0a6b0b7ef5f8 100644
--- a/libcxx/utils/data/ignore_format.txt
+++ b/libcxx/utils/data/ignore_format.txt
@@ -6512,7 +6512,6 @@ libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/void_po
libcxx/test/std/utilities/memory/allocator.traits/allocator_type.pass.cpp
libcxx/test/std/utilities/memory/allocator.traits/rebind_traits.pass.cpp
libcxx/test/std/utilities/memory/allocator.traits/value_type.pass.cpp
-libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp
libcxx/test/std/utilities/memory/c.malloc/nothing_to_do.pass.cpp
libcxx/test/std/utilities/memory/default.allocator/allocator.ctor.pass.cpp
>From 8189849282ccd63fa34bc96f7591ae6303529f9f Mon Sep 17 00:00:00 2001
From: Shivam <75530356+phyBrackets at users.noreply.github.com>
Date: Mon, 22 Jan 2024 21:33:10 +0530
Subject: [PATCH 4/4] fixing test
---
.../uses_allocator_construction_args.pass.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp b/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
index e7f0c4afa5aed2..4778cf22e0130e 100644
--- a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
+++ b/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
@@ -167,11 +167,11 @@ constexpr void testOne() {
(void)ret;
}
{
- using PairType = const std::pair<int, int>;
- const PairType p(1, 2);
+ //using PairType = const std::pair<int, int>;
+ //const PairType p(1, 2);
std::same_as<std::tuple<std::piecewise_construct_t, std::tuple<const int&&>, std::tuple<const int&&>>> auto ret =
- test_uses_allocator_construction_args<PairType>(a, std::move(p));
+ test_uses_allocator_construction_args<PairType>(a, std::move(std::pair<int, int>(3, 4)));
(void)ret;
}
}
More information about the libcxx-commits
mailing list