RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 05:47:35 +00:00
Code Issues Activity Actions

AK: Conditionally disable a few variant ctors/assignments

Browse source 
We shouldn't let copy/move ctors or assignments be instantiated if the
assignee type does not have a copy/move constructor (even if they're not
used anywhere).
This commit is contained in:
Ali Mohammad Pur 2022-02-14 17:43:49 +03:30 • committed by Idan Horowitz
parent 7a58c510e5
commit 80e6198563
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
AK/Variant.h
View file

@ -129,13 +129,13 @@ struct VariantConstructTag {
template<typename T, typename Base> template<typename T, typename Base>
struct VariantConstructors { struct VariantConstructors {
ALWAYS_INLINE VariantConstructors(T&& t) ALWAYS_INLINE VariantConstructors(T&& t) requires(requires { T(move(t)); })
{ {
internal_cast().clear_without_destruction(); internal_cast().clear_without_destruction();
internal_cast().set(move(t), VariantNoClearTag {}); internal_cast().set(move(t), VariantNoClearTag {});
} }
ALWAYS_INLINE VariantConstructors(const T& t) ALWAYS_INLINE VariantConstructors(const T& t) requires(requires { T(t); })
{ {
internal_cast().clear_without_destruction(); internal_cast().clear_without_destruction();
internal_cast().set(t, VariantNoClearTag {}); internal_cast().set(t, VariantNoClearTag {});
@ -336,7 +336,7 @@ public:
using Detail::MergeAndDeduplicatePacks<Detail::VariantConstructors<Ts, Variant<Ts...>>...>::MergeAndDeduplicatePacks; using Detail::MergeAndDeduplicatePacks<Detail::VariantConstructors<Ts, Variant<Ts...>>...>::MergeAndDeduplicatePacks;
template<typename T, typename StrippedT = RemoveCVReference<T>> template<typename T, typename StrippedT = RemoveCVReference<T>>
void set(T&& t) requires(can_contain<StrippedT>()) void set(T&& t) requires(can_contain<StrippedT>() && requires { StrippedT(forward<T>(t)); })
{ {
constexpr auto new_index = index_of<StrippedT>(); constexpr auto new_index = index_of<StrippedT>();
Helper::delete_(m_index, m_data); Helper::delete_(m_index, m_data);
@ -345,7 +345,7 @@ public:
} }
template<typename T, typename StrippedT = RemoveCVReference<T>> template<typename T, typename StrippedT = RemoveCVReference<T>>
void set(T&& t, Detail::VariantNoClearTag) requires(can_contain<StrippedT>()) void set(T&& t, Detail::VariantNoClearTag) requires(can_contain<StrippedT>() && requires { StrippedT(forward<T>(t)); })
{ {
constexpr auto new_index = index_of<StrippedT>(); constexpr auto new_index = index_of<StrippedT>();
new (m_data) StrippedT(forward<T>(t)); new (m_data) StrippedT(forward<T>(t));