RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-06 02:58:10 +00:00
Code Issues Activity Actions

Kernel: Fix KResultOr move semantics

Browse source 
We need to track whether we actually own the storage.
This commit is contained in:
Tom 2020-09-18 16:13:41 -06:00 • committed by Andreas Kling
parent 4c2f86c24f
commit 03f45febe2
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Kernel/KResult.h
View file

@ -72,12 +72,14 @@ public:
ALWAYS_INLINE KResultOr(T&& value) ALWAYS_INLINE KResultOr(T&& value)
{ {
new (&m_storage) T(move(value)); new (&m_storage) T(move(value));
m_have_storage = true;
} }
template<typename U> template<typename U>
ALWAYS_INLINE KResultOr(U&& value) ALWAYS_INLINE KResultOr(U&& value)
{ {
new (&m_storage) T(move(value)); new (&m_storage) T(move(value));
m_have_storage = true;
} }
KResultOr(KResultOr&& other) KResultOr(KResultOr&& other)
@ -86,8 +88,12 @@ public:
if (m_is_error) if (m_is_error)
m_error = other.m_error; m_error = other.m_error;
else { else {
if (other.m_have_storage) {
new (&m_storage) T(move(other.value())); new (&m_storage) T(move(other.value()));
m_have_storage = true;
other.value().~T(); other.value().~T();
other.m_have_storage = false;
}
} }
other.m_is_error = true; other.m_is_error = true;
other.m_error = KSuccess; other.m_error = KSuccess;
@ -95,14 +101,20 @@ public:
KResultOr& operator=(KResultOr&& other) KResultOr& operator=(KResultOr&& other)
{ {
if (!m_is_error) if (!m_is_error && m_have_storage) {
value().~T(); value().~T();
m_have_storage = false;
}
m_is_error = other.m_is_error; m_is_error = other.m_is_error;
if (m_is_error) if (m_is_error)
m_error = other.m_error; m_error = other.m_error;
else { else {
if (other.m_have_storage) {
new (&m_storage) T(move(other.value())); new (&m_storage) T(move(other.value()));
m_have_storage = true;
other.value().~T(); other.value().~T();
other.m_have_storage = false;
}
} }
other.m_is_error = true; other.m_is_error = true;
other.m_error = KSuccess; other.m_error = KSuccess;
@ -111,7 +123,7 @@ public:
~KResultOr() ~KResultOr()
{ {
if (!m_is_error) if (!m_is_error && m_have_storage)
value().~T(); value().~T();
} }
@ -140,8 +152,10 @@ public:
ALWAYS_INLINE T release_value() ALWAYS_INLINE T release_value()
{ {
ASSERT(!m_is_error); ASSERT(!m_is_error);
ASSERT(m_have_storage);
T released_value = *reinterpret_cast<T*>(&m_storage); T released_value = *reinterpret_cast<T*>(&m_storage);
value().~T(); value().~T();
m_have_storage = false;
return released_value; return released_value;
} }
@ -149,6 +163,7 @@ private:
alignas(T) char m_storage[sizeof(T)]; alignas(T) char m_storage[sizeof(T)];
KResult m_error; KResult m_error;
bool m_is_error { false }; bool m_is_error { false };
bool m_have_storage { false };
}; };
} }