haikuwebkit/Source/WTF/wtf/CompactUniquePtrTuple.h

127 lines
4.5 KiB
C
Raw Permalink Normal View History

Add CompactUniquePtrTuple https://bugs.webkit.org/show_bug.cgi?id=215936 Reviewed by Darin Adler. Source/WTF: Added a new template class, CompactUniquePtrTuple, which stores a pointer and up to 16-bits of a POD type using CompactPointerTuple. * WTF.xcodeproj/project.pbxproj: * wtf/CMakeLists.txt: * wtf/CompactUniquePtrTuple.h: Added. (WTF::makeCompactUniquePtr): Added. Like makeUnique, creates an object of the specified type and returns CompactUniquePtrTuple. (WTF::CompactUniquePtrTuple): Added. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Move constructor. (WTF::CompactUniquePtrTuple::~CompactUniquePtrTuple): (WTF::CompactUniquePtrTuple::operator=): (WTF::CompactUniquePtrTuple::pointer): (WTF::CompactUniquePtrTuple::moveToUniquePtr): Clears this pointer and returns unique_ptr. (WTF::CompactUniquePtrTuple::setPointer): Like CompactPointerTuple sets the pointer component of this tuple, freeing the old object if there is already one stored. (WTF::CompactUniquePtrTuple::type): (WTF::CompactUniquePtrTuple::setType): (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Constructor which takes unique_ptr&&. (WTF::CompactUniquePtrTuple::deletePointer): Tools: Added basic unit tests for CompactUniquePtrTuple. * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: Added. (TestWebKitAPI::A): Adde. (TestWebKitAPI::A::A): (TestWebKitAPI::A::~A): (WTF_CompactUniquePtrTuple.Basic): Canonical link: https://commits.webkit.org/228962@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-04 03:01:34 +00:00
/*
* Copyright (C) 2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once
#include <memory>
#include <wtf/CompactPointerTuple.h>
#include <wtf/Noncopyable.h>
namespace WTF {
template<typename T, typename Type, typename Deleter = std::default_delete<T>> class CompactUniquePtrTuple;
template<typename T, typename Type, typename... Args>
ALWAYS_INLINE CompactUniquePtrTuple<T, Type> makeCompactUniquePtr(Args&&... args)
{
return CompactUniquePtrTuple<T, Type>(makeUnique<T>(std::forward<Args>(args)...));
}
template<typename T, typename Type, typename Deleter, typename... Args>
Make CompactUniquePtrTuple actually work with subclassing and custom deleter https://bugs.webkit.org/show_bug.cgi?id=216225 Reviewed by Darin Adler. Source/WTF: Fixed bugs in CompactUniquePtrTuple which prevented subclassing and custom deleter to work. * wtf/CompactPointerTuple.h: (WTF::CompactPointerTuple::CompactPointerTuple): Added move constructor with implicit cast of a convertible pointer type. * wtf/CompactUniquePtrTuple.h: (WTF::makeCompactUniquePtr): Added the missing deleter from the return type. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Allow Deleter to be different if it's the default deleter in the move constructor so that CompactUniquePtrTuple<U, Type> could be moved to CompactUniquePtrTuple<T, Type> if U is convertible to T without having to specify the same deleter (std::default_delete<U> is not same as std::default_delete<T> but allow it). (WTF::CompactUniquePtrTuple::operator=): Ditto. (WTF::CompactUniquePtrTuple::setPointer): Ditto from std::unique_ptr. (WTF::CompactUniquePtrTuple): Friend declare all other specializations of CompactUniquePtrTuple so that the above fixes work. Tools: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: (TestWebKitAPI::A::~A): Make this virtual. (TestWebKitAPI::B): Added. (TestWebKitAPI::B::B): Added. (TestWebKitAPI::B::~B): Added. (WTF_CompactUniquePtrTuple.Subclassing): Added. Tests subclassing. (TestWebKitAPI::ADeleter): Added. (TestWebKitAPI::ADeleter::operator() const): (WTF_CompactUniquePtrTuple.Deleter): Added. Tests a custom deleter. Canonical link: https://commits.webkit.org/229082@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266713 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-08 03:50:14 +00:00
ALWAYS_INLINE CompactUniquePtrTuple<T, Type, Deleter> makeCompactUniquePtr(Args&&... args)
Add CompactUniquePtrTuple https://bugs.webkit.org/show_bug.cgi?id=215936 Reviewed by Darin Adler. Source/WTF: Added a new template class, CompactUniquePtrTuple, which stores a pointer and up to 16-bits of a POD type using CompactPointerTuple. * WTF.xcodeproj/project.pbxproj: * wtf/CMakeLists.txt: * wtf/CompactUniquePtrTuple.h: Added. (WTF::makeCompactUniquePtr): Added. Like makeUnique, creates an object of the specified type and returns CompactUniquePtrTuple. (WTF::CompactUniquePtrTuple): Added. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Move constructor. (WTF::CompactUniquePtrTuple::~CompactUniquePtrTuple): (WTF::CompactUniquePtrTuple::operator=): (WTF::CompactUniquePtrTuple::pointer): (WTF::CompactUniquePtrTuple::moveToUniquePtr): Clears this pointer and returns unique_ptr. (WTF::CompactUniquePtrTuple::setPointer): Like CompactPointerTuple sets the pointer component of this tuple, freeing the old object if there is already one stored. (WTF::CompactUniquePtrTuple::type): (WTF::CompactUniquePtrTuple::setType): (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Constructor which takes unique_ptr&&. (WTF::CompactUniquePtrTuple::deletePointer): Tools: Added basic unit tests for CompactUniquePtrTuple. * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: Added. (TestWebKitAPI::A): Adde. (TestWebKitAPI::A::A): (TestWebKitAPI::A::~A): (WTF_CompactUniquePtrTuple.Basic): Canonical link: https://commits.webkit.org/228962@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-04 03:01:34 +00:00
{
return CompactUniquePtrTuple<T, Type, Deleter>(makeUnique<T>(std::forward<Args>(args)...));
}
template<typename T, typename Type, typename Deleter>
class CompactUniquePtrTuple final {
WTF_MAKE_FAST_ALLOCATED;
WTF_MAKE_NONCOPYABLE(CompactUniquePtrTuple);
public:
CompactUniquePtrTuple() = default;
Make CompactUniquePtrTuple actually work with subclassing and custom deleter https://bugs.webkit.org/show_bug.cgi?id=216225 Reviewed by Darin Adler. Source/WTF: Fixed bugs in CompactUniquePtrTuple which prevented subclassing and custom deleter to work. * wtf/CompactPointerTuple.h: (WTF::CompactPointerTuple::CompactPointerTuple): Added move constructor with implicit cast of a convertible pointer type. * wtf/CompactUniquePtrTuple.h: (WTF::makeCompactUniquePtr): Added the missing deleter from the return type. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Allow Deleter to be different if it's the default deleter in the move constructor so that CompactUniquePtrTuple<U, Type> could be moved to CompactUniquePtrTuple<T, Type> if U is convertible to T without having to specify the same deleter (std::default_delete<U> is not same as std::default_delete<T> but allow it). (WTF::CompactUniquePtrTuple::operator=): Ditto. (WTF::CompactUniquePtrTuple::setPointer): Ditto from std::unique_ptr. (WTF::CompactUniquePtrTuple): Friend declare all other specializations of CompactUniquePtrTuple so that the above fixes work. Tools: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: (TestWebKitAPI::A::~A): Make this virtual. (TestWebKitAPI::B): Added. (TestWebKitAPI::B::B): Added. (TestWebKitAPI::B::~B): Added. (WTF_CompactUniquePtrTuple.Subclassing): Added. Tests subclassing. (TestWebKitAPI::ADeleter): Added. (TestWebKitAPI::ADeleter::operator() const): (WTF_CompactUniquePtrTuple.Deleter): Added. Tests a custom deleter. Canonical link: https://commits.webkit.org/229082@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266713 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-08 03:50:14 +00:00
template <typename U, typename UDeleter, typename = std::enable_if_t<std::is_same<UDeleter, Deleter>::value || std::is_same<UDeleter, std::default_delete<U>>::value>>
CompactUniquePtrTuple(CompactUniquePtrTuple<U, Type, UDeleter>&& other)
Add CompactUniquePtrTuple https://bugs.webkit.org/show_bug.cgi?id=215936 Reviewed by Darin Adler. Source/WTF: Added a new template class, CompactUniquePtrTuple, which stores a pointer and up to 16-bits of a POD type using CompactPointerTuple. * WTF.xcodeproj/project.pbxproj: * wtf/CMakeLists.txt: * wtf/CompactUniquePtrTuple.h: Added. (WTF::makeCompactUniquePtr): Added. Like makeUnique, creates an object of the specified type and returns CompactUniquePtrTuple. (WTF::CompactUniquePtrTuple): Added. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Move constructor. (WTF::CompactUniquePtrTuple::~CompactUniquePtrTuple): (WTF::CompactUniquePtrTuple::operator=): (WTF::CompactUniquePtrTuple::pointer): (WTF::CompactUniquePtrTuple::moveToUniquePtr): Clears this pointer and returns unique_ptr. (WTF::CompactUniquePtrTuple::setPointer): Like CompactPointerTuple sets the pointer component of this tuple, freeing the old object if there is already one stored. (WTF::CompactUniquePtrTuple::type): (WTF::CompactUniquePtrTuple::setType): (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Constructor which takes unique_ptr&&. (WTF::CompactUniquePtrTuple::deletePointer): Tools: Added basic unit tests for CompactUniquePtrTuple. * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: Added. (TestWebKitAPI::A): Adde. (TestWebKitAPI::A::A): (TestWebKitAPI::A::~A): (WTF_CompactUniquePtrTuple.Basic): Canonical link: https://commits.webkit.org/228962@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-04 03:01:34 +00:00
: m_data { std::exchange(other.m_data, { }) }
{
}
~CompactUniquePtrTuple()
{
setPointer(nullptr);
}
Make CompactUniquePtrTuple actually work with subclassing and custom deleter https://bugs.webkit.org/show_bug.cgi?id=216225 Reviewed by Darin Adler. Source/WTF: Fixed bugs in CompactUniquePtrTuple which prevented subclassing and custom deleter to work. * wtf/CompactPointerTuple.h: (WTF::CompactPointerTuple::CompactPointerTuple): Added move constructor with implicit cast of a convertible pointer type. * wtf/CompactUniquePtrTuple.h: (WTF::makeCompactUniquePtr): Added the missing deleter from the return type. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Allow Deleter to be different if it's the default deleter in the move constructor so that CompactUniquePtrTuple<U, Type> could be moved to CompactUniquePtrTuple<T, Type> if U is convertible to T without having to specify the same deleter (std::default_delete<U> is not same as std::default_delete<T> but allow it). (WTF::CompactUniquePtrTuple::operator=): Ditto. (WTF::CompactUniquePtrTuple::setPointer): Ditto from std::unique_ptr. (WTF::CompactUniquePtrTuple): Friend declare all other specializations of CompactUniquePtrTuple so that the above fixes work. Tools: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: (TestWebKitAPI::A::~A): Make this virtual. (TestWebKitAPI::B): Added. (TestWebKitAPI::B::B): Added. (TestWebKitAPI::B::~B): Added. (WTF_CompactUniquePtrTuple.Subclassing): Added. Tests subclassing. (TestWebKitAPI::ADeleter): Added. (TestWebKitAPI::ADeleter::operator() const): (WTF_CompactUniquePtrTuple.Deleter): Added. Tests a custom deleter. Canonical link: https://commits.webkit.org/229082@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266713 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-08 03:50:14 +00:00
template <typename U, typename UDeleter, typename = std::enable_if_t<std::is_same<UDeleter, Deleter>::value || std::is_same<UDeleter, std::default_delete<U>>::value>>
CompactUniquePtrTuple<T, Type, Deleter>& operator=(CompactUniquePtrTuple<U, Type, UDeleter>&& other)
Add CompactUniquePtrTuple https://bugs.webkit.org/show_bug.cgi?id=215936 Reviewed by Darin Adler. Source/WTF: Added a new template class, CompactUniquePtrTuple, which stores a pointer and up to 16-bits of a POD type using CompactPointerTuple. * WTF.xcodeproj/project.pbxproj: * wtf/CMakeLists.txt: * wtf/CompactUniquePtrTuple.h: Added. (WTF::makeCompactUniquePtr): Added. Like makeUnique, creates an object of the specified type and returns CompactUniquePtrTuple. (WTF::CompactUniquePtrTuple): Added. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Move constructor. (WTF::CompactUniquePtrTuple::~CompactUniquePtrTuple): (WTF::CompactUniquePtrTuple::operator=): (WTF::CompactUniquePtrTuple::pointer): (WTF::CompactUniquePtrTuple::moveToUniquePtr): Clears this pointer and returns unique_ptr. (WTF::CompactUniquePtrTuple::setPointer): Like CompactPointerTuple sets the pointer component of this tuple, freeing the old object if there is already one stored. (WTF::CompactUniquePtrTuple::type): (WTF::CompactUniquePtrTuple::setType): (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Constructor which takes unique_ptr&&. (WTF::CompactUniquePtrTuple::deletePointer): Tools: Added basic unit tests for CompactUniquePtrTuple. * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: Added. (TestWebKitAPI::A): Adde. (TestWebKitAPI::A::A): (TestWebKitAPI::A::~A): (WTF_CompactUniquePtrTuple.Basic): Canonical link: https://commits.webkit.org/228962@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-04 03:01:34 +00:00
{
Make CompactUniquePtrTuple actually work with subclassing and custom deleter https://bugs.webkit.org/show_bug.cgi?id=216225 Reviewed by Darin Adler. Source/WTF: Fixed bugs in CompactUniquePtrTuple which prevented subclassing and custom deleter to work. * wtf/CompactPointerTuple.h: (WTF::CompactPointerTuple::CompactPointerTuple): Added move constructor with implicit cast of a convertible pointer type. * wtf/CompactUniquePtrTuple.h: (WTF::makeCompactUniquePtr): Added the missing deleter from the return type. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Allow Deleter to be different if it's the default deleter in the move constructor so that CompactUniquePtrTuple<U, Type> could be moved to CompactUniquePtrTuple<T, Type> if U is convertible to T without having to specify the same deleter (std::default_delete<U> is not same as std::default_delete<T> but allow it). (WTF::CompactUniquePtrTuple::operator=): Ditto. (WTF::CompactUniquePtrTuple::setPointer): Ditto from std::unique_ptr. (WTF::CompactUniquePtrTuple): Friend declare all other specializations of CompactUniquePtrTuple so that the above fixes work. Tools: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: (TestWebKitAPI::A::~A): Make this virtual. (TestWebKitAPI::B): Added. (TestWebKitAPI::B::B): Added. (TestWebKitAPI::B::~B): Added. (WTF_CompactUniquePtrTuple.Subclassing): Added. Tests subclassing. (TestWebKitAPI::ADeleter): Added. (TestWebKitAPI::ADeleter::operator() const): (WTF_CompactUniquePtrTuple.Deleter): Added. Tests a custom deleter. Canonical link: https://commits.webkit.org/229082@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266713 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-08 03:50:14 +00:00
CompactUniquePtrTuple moved { WTFMove(other) };
Add CompactUniquePtrTuple https://bugs.webkit.org/show_bug.cgi?id=215936 Reviewed by Darin Adler. Source/WTF: Added a new template class, CompactUniquePtrTuple, which stores a pointer and up to 16-bits of a POD type using CompactPointerTuple. * WTF.xcodeproj/project.pbxproj: * wtf/CMakeLists.txt: * wtf/CompactUniquePtrTuple.h: Added. (WTF::makeCompactUniquePtr): Added. Like makeUnique, creates an object of the specified type and returns CompactUniquePtrTuple. (WTF::CompactUniquePtrTuple): Added. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Move constructor. (WTF::CompactUniquePtrTuple::~CompactUniquePtrTuple): (WTF::CompactUniquePtrTuple::operator=): (WTF::CompactUniquePtrTuple::pointer): (WTF::CompactUniquePtrTuple::moveToUniquePtr): Clears this pointer and returns unique_ptr. (WTF::CompactUniquePtrTuple::setPointer): Like CompactPointerTuple sets the pointer component of this tuple, freeing the old object if there is already one stored. (WTF::CompactUniquePtrTuple::type): (WTF::CompactUniquePtrTuple::setType): (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Constructor which takes unique_ptr&&. (WTF::CompactUniquePtrTuple::deletePointer): Tools: Added basic unit tests for CompactUniquePtrTuple. * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: Added. (TestWebKitAPI::A): Adde. (TestWebKitAPI::A::A): (TestWebKitAPI::A::~A): (WTF_CompactUniquePtrTuple.Basic): Canonical link: https://commits.webkit.org/228962@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-04 03:01:34 +00:00
std::swap(m_data, moved.m_data);
return *this;
}
T* pointer() const { return m_data.pointer(); }
std::unique_ptr<T, Deleter> moveToUniquePtr()
{
T* pointer = m_data.pointer();
m_data.setPointer(nullptr);
return std::unique_ptr<T, Deleter>(pointer);
}
void setPointer(std::nullptr_t)
Add CompactUniquePtrTuple https://bugs.webkit.org/show_bug.cgi?id=215936 Reviewed by Darin Adler. Source/WTF: Added a new template class, CompactUniquePtrTuple, which stores a pointer and up to 16-bits of a POD type using CompactPointerTuple. * WTF.xcodeproj/project.pbxproj: * wtf/CMakeLists.txt: * wtf/CompactUniquePtrTuple.h: Added. (WTF::makeCompactUniquePtr): Added. Like makeUnique, creates an object of the specified type and returns CompactUniquePtrTuple. (WTF::CompactUniquePtrTuple): Added. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Move constructor. (WTF::CompactUniquePtrTuple::~CompactUniquePtrTuple): (WTF::CompactUniquePtrTuple::operator=): (WTF::CompactUniquePtrTuple::pointer): (WTF::CompactUniquePtrTuple::moveToUniquePtr): Clears this pointer and returns unique_ptr. (WTF::CompactUniquePtrTuple::setPointer): Like CompactPointerTuple sets the pointer component of this tuple, freeing the old object if there is already one stored. (WTF::CompactUniquePtrTuple::type): (WTF::CompactUniquePtrTuple::setType): (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Constructor which takes unique_ptr&&. (WTF::CompactUniquePtrTuple::deletePointer): Tools: Added basic unit tests for CompactUniquePtrTuple. * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: Added. (TestWebKitAPI::A): Adde. (TestWebKitAPI::A::A): (TestWebKitAPI::A::~A): (WTF_CompactUniquePtrTuple.Basic): Canonical link: https://commits.webkit.org/228962@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-04 03:01:34 +00:00
{
deletePointer();
m_data.setPointer(nullptr);
}
Make CompactUniquePtrTuple actually work with subclassing and custom deleter https://bugs.webkit.org/show_bug.cgi?id=216225 Reviewed by Darin Adler. Source/WTF: Fixed bugs in CompactUniquePtrTuple which prevented subclassing and custom deleter to work. * wtf/CompactPointerTuple.h: (WTF::CompactPointerTuple::CompactPointerTuple): Added move constructor with implicit cast of a convertible pointer type. * wtf/CompactUniquePtrTuple.h: (WTF::makeCompactUniquePtr): Added the missing deleter from the return type. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Allow Deleter to be different if it's the default deleter in the move constructor so that CompactUniquePtrTuple<U, Type> could be moved to CompactUniquePtrTuple<T, Type> if U is convertible to T without having to specify the same deleter (std::default_delete<U> is not same as std::default_delete<T> but allow it). (WTF::CompactUniquePtrTuple::operator=): Ditto. (WTF::CompactUniquePtrTuple::setPointer): Ditto from std::unique_ptr. (WTF::CompactUniquePtrTuple): Friend declare all other specializations of CompactUniquePtrTuple so that the above fixes work. Tools: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: (TestWebKitAPI::A::~A): Make this virtual. (TestWebKitAPI::B): Added. (TestWebKitAPI::B::B): Added. (TestWebKitAPI::B::~B): Added. (WTF_CompactUniquePtrTuple.Subclassing): Added. Tests subclassing. (TestWebKitAPI::ADeleter): Added. (TestWebKitAPI::ADeleter::operator() const): (WTF_CompactUniquePtrTuple.Deleter): Added. Tests a custom deleter. Canonical link: https://commits.webkit.org/229082@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266713 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-08 03:50:14 +00:00
template <typename U, typename UDeleter, typename = std::enable_if_t<std::is_same<UDeleter, Deleter>::value || std::is_same<UDeleter, std::default_delete<U>>::value>>
void setPointer(std::unique_ptr<U, UDeleter>&& pointer)
Add CompactUniquePtrTuple https://bugs.webkit.org/show_bug.cgi?id=215936 Reviewed by Darin Adler. Source/WTF: Added a new template class, CompactUniquePtrTuple, which stores a pointer and up to 16-bits of a POD type using CompactPointerTuple. * WTF.xcodeproj/project.pbxproj: * wtf/CMakeLists.txt: * wtf/CompactUniquePtrTuple.h: Added. (WTF::makeCompactUniquePtr): Added. Like makeUnique, creates an object of the specified type and returns CompactUniquePtrTuple. (WTF::CompactUniquePtrTuple): Added. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Move constructor. (WTF::CompactUniquePtrTuple::~CompactUniquePtrTuple): (WTF::CompactUniquePtrTuple::operator=): (WTF::CompactUniquePtrTuple::pointer): (WTF::CompactUniquePtrTuple::moveToUniquePtr): Clears this pointer and returns unique_ptr. (WTF::CompactUniquePtrTuple::setPointer): Like CompactPointerTuple sets the pointer component of this tuple, freeing the old object if there is already one stored. (WTF::CompactUniquePtrTuple::type): (WTF::CompactUniquePtrTuple::setType): (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Constructor which takes unique_ptr&&. (WTF::CompactUniquePtrTuple::deletePointer): Tools: Added basic unit tests for CompactUniquePtrTuple. * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: Added. (TestWebKitAPI::A): Adde. (TestWebKitAPI::A::A): (TestWebKitAPI::A::~A): (WTF_CompactUniquePtrTuple.Basic): Canonical link: https://commits.webkit.org/228962@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-04 03:01:34 +00:00
{
deletePointer();
m_data.setPointer(pointer.release());
}
Type type() const { return m_data.type(); }
void setType(Type type)
{
m_data.setType(type);
}
private:
CompactUniquePtrTuple(std::unique_ptr<T>&& pointer)
{
m_data.setPointer(pointer.release());
}
void deletePointer()
{
if (T* pointer = m_data.pointer())
Deleter()(pointer);
}
template<typename U, typename E, typename... Args> friend CompactUniquePtrTuple<U, E> makeCompactUniquePtr(Args&&... args);
template<typename U, typename E, typename D, typename... Args> friend CompactUniquePtrTuple<U, E, D> makeCompactUniquePtr(Args&&... args);
Make CompactUniquePtrTuple actually work with subclassing and custom deleter https://bugs.webkit.org/show_bug.cgi?id=216225 Reviewed by Darin Adler. Source/WTF: Fixed bugs in CompactUniquePtrTuple which prevented subclassing and custom deleter to work. * wtf/CompactPointerTuple.h: (WTF::CompactPointerTuple::CompactPointerTuple): Added move constructor with implicit cast of a convertible pointer type. * wtf/CompactUniquePtrTuple.h: (WTF::makeCompactUniquePtr): Added the missing deleter from the return type. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Allow Deleter to be different if it's the default deleter in the move constructor so that CompactUniquePtrTuple<U, Type> could be moved to CompactUniquePtrTuple<T, Type> if U is convertible to T without having to specify the same deleter (std::default_delete<U> is not same as std::default_delete<T> but allow it). (WTF::CompactUniquePtrTuple::operator=): Ditto. (WTF::CompactUniquePtrTuple::setPointer): Ditto from std::unique_ptr. (WTF::CompactUniquePtrTuple): Friend declare all other specializations of CompactUniquePtrTuple so that the above fixes work. Tools: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: (TestWebKitAPI::A::~A): Make this virtual. (TestWebKitAPI::B): Added. (TestWebKitAPI::B::B): Added. (TestWebKitAPI::B::~B): Added. (WTF_CompactUniquePtrTuple.Subclassing): Added. Tests subclassing. (TestWebKitAPI::ADeleter): Added. (TestWebKitAPI::ADeleter::operator() const): (WTF_CompactUniquePtrTuple.Deleter): Added. Tests a custom deleter. Canonical link: https://commits.webkit.org/229082@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266713 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-08 03:50:14 +00:00
template <typename, typename, typename> friend class CompactUniquePtrTuple;
Add CompactUniquePtrTuple https://bugs.webkit.org/show_bug.cgi?id=215936 Reviewed by Darin Adler. Source/WTF: Added a new template class, CompactUniquePtrTuple, which stores a pointer and up to 16-bits of a POD type using CompactPointerTuple. * WTF.xcodeproj/project.pbxproj: * wtf/CMakeLists.txt: * wtf/CompactUniquePtrTuple.h: Added. (WTF::makeCompactUniquePtr): Added. Like makeUnique, creates an object of the specified type and returns CompactUniquePtrTuple. (WTF::CompactUniquePtrTuple): Added. (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Move constructor. (WTF::CompactUniquePtrTuple::~CompactUniquePtrTuple): (WTF::CompactUniquePtrTuple::operator=): (WTF::CompactUniquePtrTuple::pointer): (WTF::CompactUniquePtrTuple::moveToUniquePtr): Clears this pointer and returns unique_ptr. (WTF::CompactUniquePtrTuple::setPointer): Like CompactPointerTuple sets the pointer component of this tuple, freeing the old object if there is already one stored. (WTF::CompactUniquePtrTuple::type): (WTF::CompactUniquePtrTuple::setType): (WTF::CompactUniquePtrTuple::CompactUniquePtrTuple): Constructor which takes unique_ptr&&. (WTF::CompactUniquePtrTuple::deletePointer): Tools: Added basic unit tests for CompactUniquePtrTuple. * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WTF/CompactUniquePtrTuple.cpp: Added. (TestWebKitAPI::A): Adde. (TestWebKitAPI::A::A): (TestWebKitAPI::A::~A): (WTF_CompactUniquePtrTuple.Basic): Canonical link: https://commits.webkit.org/228962@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-04 03:01:34 +00:00
CompactPointerTuple<T*, Type> m_data;
};
} // namespace WTF
using WTF::CompactUniquePtrTuple;
using WTF::makeCompactUniquePtr;