RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00
Code Issues Projects Releases Wiki Activity

[C++11] Add support for OwningPtr<T> to be converted to and from

Browse Source 
std::unique_ptr<T>.

Patch by Ahmed Charles!

llvm-svn: 202609
This commit is contained in:
Chandler Carruth 2014-03-02 03:38:32 +00:00
parent 90cab68af4
commit 137ae633c7
2 changed files with 92 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/llvm/ADT/OwningPtr.h
View File

@ -17,6 +17,7 @@
#include "llvm/Support/Compiler.h" #include "llvm/Support/Compiler.h"
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
#include <memory>
namespace llvm { namespace llvm {
@ -39,6 +40,17 @@ public:
return *this; return *this;
} }
OwningPtr(std::unique_ptr<T> &&Other) : Ptr(Other.release()) {}
OwningPtr &operator=(std::unique_ptr<T> &&Other) {
reset(Other.release());
return *this;
}
#if LLVM_HAS_RVALUE_REFERENCE_THIS
operator std::unique_ptr<T>() && { return std::unique_ptr<T>(take()); }
#endif
~OwningPtr() { ~OwningPtr() {
delete Ptr; delete Ptr;
} }
@ -61,6 +73,8 @@ public:
return Tmp; return Tmp;
} }
std::unique_ptr<T> take_unique() { return std::unique_ptr<T>(take()); }
T &operator*() const { T &operator*() const {
assert(Ptr && "Cannot dereference null pointer"); assert(Ptr && "Cannot dereference null pointer");
return *Ptr; return *Ptr;

78
unittests/ADT/OwningPtrTest.cpp
View File

@ -174,4 +174,82 @@ TEST_F(OwningPtrTest, Swap) {
EXPECT_EQ(2u, TrackDestructor::Destructions); EXPECT_EQ(2u, TrackDestructor::Destructions);
} }
TEST_F(OwningPtrTest, UniqueToOwningConstruction) {
TrackDestructor::ResetCounts();
{
std::unique_ptr<TrackDestructor> A(new TrackDestructor(3));
OwningPtr<TrackDestructor> B = std::move(A);
EXPECT_FALSE(A);
EXPECT_TRUE(!A);
EXPECT_FALSE(A.get());
EXPECT_TRUE((bool)B);
EXPECT_FALSE(!B);
EXPECT_TRUE(B.get());
EXPECT_TRUE(B.isValid());
EXPECT_EQ(3, (*B).val);
EXPECT_EQ(3, B->val);
EXPECT_EQ(0u, TrackDestructor::Destructions);
}
EXPECT_EQ(1u, TrackDestructor::Destructions);
}
TEST_F(OwningPtrTest, UniqueToOwningAssignment) {
TrackDestructor::ResetCounts();
{
std::unique_ptr<TrackDestructor> A(new TrackDestructor(3));
OwningPtr<TrackDestructor> B(new TrackDestructor(4));
B = std::move(A);
EXPECT_FALSE(A);
EXPECT_TRUE(!A);
EXPECT_FALSE(A.get());
EXPECT_TRUE((bool)B);
EXPECT_FALSE(!B);
EXPECT_TRUE(B.get());
EXPECT_TRUE(B.isValid());
EXPECT_EQ(3, (*B).val);
EXPECT_EQ(3, B->val);
EXPECT_EQ(1u, TrackDestructor::Destructions);
}
EXPECT_EQ(2u, TrackDestructor::Destructions);
}
TEST_F(OwningPtrTest, TakeUniqueConstruction) {
TrackDestructor::ResetCounts();
{
OwningPtr<TrackDestructor> A(new TrackDestructor(3));
std::unique_ptr<TrackDestructor> B = A.take_unique();
EXPECT_FALSE(A);
EXPECT_TRUE(!A);
EXPECT_FALSE(A.get());
EXPECT_FALSE(A.isValid());
EXPECT_TRUE((bool)B);
EXPECT_FALSE(!B);
EXPECT_TRUE(B.get());
EXPECT_EQ(3, (*B).val);
EXPECT_EQ(3, B->val);
EXPECT_EQ(0u, TrackDestructor::Destructions);
}
EXPECT_EQ(1u, TrackDestructor::Destructions);
}
#if LLVM_HAS_RVALUE_REFERENCE_THIS
TEST_F(OwningPtrTest, OwningToUniqueConstruction) {
TrackDestructor::ResetCounts();
{
OwningPtr<TrackDestructor> A(new TrackDestructor(3));
std::unique_ptr<TrackDestructor> B = std::move(A);
EXPECT_FALSE(A);
EXPECT_TRUE(!A);
EXPECT_FALSE(A.get());
EXPECT_FALSE(A.isValid());
EXPECT_TRUE((bool)B);
EXPECT_FALSE(!B);
EXPECT_TRUE(B.get());
EXPECT_EQ(3, (*B).val);
EXPECT_EQ(3, B->val);
EXPECT_EQ(0u, TrackDestructor::Destructions);
}
EXPECT_EQ(1u, TrackDestructor::Destructions);
}
#endif
} }