diff options
| -rw-r--r-- | include/llvm/ADT/OwningPtr.h | 2 | ||||
| -rw-r--r-- | unittests/ADT/OwningPtrTest.cpp | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/include/llvm/ADT/OwningPtr.h b/include/llvm/ADT/OwningPtr.h index 5453d5c84e4..034bcfd6edd 100644 --- a/include/llvm/ADT/OwningPtr.h +++ b/include/llvm/ADT/OwningPtr.h @@ -73,6 +73,8 @@ public: return Tmp; } + T *release() { return take(); } + std::unique_ptr<T> take_unique() { return std::unique_ptr<T>(take()); } T &operator*() const { diff --git a/unittests/ADT/OwningPtrTest.cpp b/unittests/ADT/OwningPtrTest.cpp index aef4d97bd66..8b10f475d09 100644 --- a/unittests/ADT/OwningPtrTest.cpp +++ b/unittests/ADT/OwningPtrTest.cpp @@ -90,6 +90,24 @@ TEST_F(OwningPtrTest, Take) { EXPECT_EQ(1u, TrackDestructor::Destructions); } +TEST_F(OwningPtrTest, Release) { + TrackDestructor::ResetCounts(); + TrackDestructor *T = 0; + { + OwningPtr<TrackDestructor> O(new TrackDestructor(3)); + T = O.release(); + EXPECT_FALSE((bool)O); + EXPECT_TRUE(!O); + EXPECT_FALSE(O.get()); + EXPECT_FALSE(O.isValid()); + EXPECT_TRUE(T); + EXPECT_EQ(3, T->val); + EXPECT_EQ(0u, TrackDestructor::Destructions); + } + delete T; + EXPECT_EQ(1u, TrackDestructor::Destructions); +} + TEST_F(OwningPtrTest, MoveConstruction) { TrackDestructor::ResetCounts(); { |