AK: Make it possible to swap() a NonnullRefPtr with itself

The generic swap() is not able to swap a NonnullRefPtr with itself, due to its use of a temporary and NonnullRefPtr asserting when trying to move() from an already move()'d instance.
luteresa · Jan 19, 2020 · 39b3c0e · 39b3c0e
1 parent 604c5cb
commit 39b3c0e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/AK/NonnullRefPtr.h b/AK/NonnullRefPtr.h
@@ -267,6 +267,12 @@ inline const LogStream& operator<<(const LogStream& stream, const NonnullRefPtr<
  return stream << value.ptr();
 }
 
+template<typename T, typename U>
+inline void swap(NonnullRefPtr<T>& a, NonnullRefPtr<U>& b)
+{
+ a.swap(b);
+}
+
 }
 
 using AK::adopt;

diff --git a/AK/Tests/TestNonnullRefPtr.cpp b/AK/Tests/TestNonnullRefPtr.cpp
@@ -73,4 +73,11 @@ TEST_CASE(assign_owner_of_self)
  EXPECT_EQ(child->ref_count(), 1);
 }
 
+TEST_CASE(swap_with_self)
+{
+ auto object = adopt(*new Object);
+ swap(object, object);
+ EXPECT_EQ(object->ref_count(), 1);
+}
+
 TEST_MAIN(String)