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

AK: Remove experimental clang -Wconsumed stuff

Browse source 
This stopped working quite some time ago due to Clang losing track of
typestates for some reason and everything becoming "unknown".

Since we're primarily using GCC anyway, it doesn't seem worth it to try
and maintain this non-working experiment for a secondary compiler.

Also it doesn't look like the Clang team is actively maintaining this
flag anyway. So good-bye, -Wconsumed. :/
This commit is contained in:
Andreas Kling 2020-05-16 10:51:21 +02:00
parent 16c858d9f0
commit 76bcd284f9
5 changed files with 5 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

17
AK/NonnullOwnPtr.h
View file

@ -42,25 +42,22 @@ template<typename T>
class WeakPtr;
template<typename T>
class CONSUMABLE(unconsumed) NonnullOwnPtr {
class NonnullOwnPtr {
public:
typedef T ElementType;
enum AdoptTag { Adopt };
RETURN_TYPESTATE(unconsumed)
NonnullOwnPtr(AdoptTag, T& ptr)
: m_ptr(&ptr)
{
}
RETURN_TYPESTATE(unconsumed)
NonnullOwnPtr(NonnullOwnPtr&& other)
: m_ptr(other.leak_ptr())
{
ASSERT(m_ptr);
}
template<typename U>
RETURN_TYPESTATE(unconsumed)
NonnullOwnPtr(NonnullOwnPtr<U>&& other)
: m_ptr(other.leak_ptr())
{
@ -97,7 +94,6 @@ public:
template<typename U>
NonnullOwnPtr& operator=(const WeakPtr<U>&) = delete;
RETURN_TYPESTATE(unconsumed)
NonnullOwnPtr& operator=(NonnullOwnPtr&& other)
{
NonnullOwnPtr ptr(move(other));
@ -106,7 +102,6 @@ public:
}
template<typename U>
RETURN_TYPESTATE(unconsumed)
NonnullOwnPtr& operator=(NonnullOwnPtr<U>&& other)
{
NonnullOwnPtr ptr(move(other));
@ -114,31 +109,21 @@ public:
return *this;
}
CALLABLE_WHEN(unconsumed)
SET_TYPESTATE(consumed)
T* leak_ptr()
{
return exchange(m_ptr, nullptr);
}
CALLABLE_WHEN(unconsumed)
T* ptr() { return m_ptr; }
CALLABLE_WHEN(unconsumed)
const T* ptr() const { return m_ptr; }
CALLABLE_WHEN(unconsumed)
T* operator->() { return m_ptr; }
CALLABLE_WHEN(unconsumed)
const T* operator->() const { return m_ptr; }
CALLABLE_WHEN(unconsumed)
T& operator*() { return *m_ptr; }
CALLABLE_WHEN(unconsumed)
const T& operator*() const { return *m_ptr; }
CALLABLE_WHEN(unconsumed)
operator const T*() const { return m_ptr; }
CALLABLE_WHEN(unconsumed)
operator T*() { return m_ptr; }
operator bool() const = delete;