Changeset 170055 in webkit

Timestamp:

Jun 17, 2014, 9:16:38 AM (11 years ago)

Author:

mitz@apple.com

Message:

String::isolatedCopy doesn’t return an isolated copy when used on an rvalue reference
​https://bugs.webkit.org/show_bug.cgi?id=133968

Reviewed by Anders Carlsson.

Source/WTF:
Made the rvalue reference overload of isolatedCopy() non-const, so that std::move(*this) is
an rvalue reference that can be moved, rather than copied, into the returned String.

• wtf/text/WTFString.cpp:

(WTF::String::isolatedCopy):

• wtf/text/WTFString.h:

Tools:

• TestWebKitAPI/Tests/WTF/WTFString.cpp:

(TestWebKitAPI::TEST): Added a test that an isolated copy of an rvalue reference doesn’t
share an impl() with the original.

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/text/WTFString.cpp (modified) (1 diff)
• Source/WTF/wtf/text/WTFString.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-06-17  Dan Bernstein  <mitz@apple.com>
+
+        String::isolatedCopy doesn’t return an isolated copy when used on an rvalue reference
+        https://bugs.webkit.org/show_bug.cgi?id=133968
+
+        Reviewed by Anders Carlsson.
+
+        Made the rvalue reference overload of isolatedCopy() non-const, so that std::move(*this) is
+        an rvalue reference that can be moved, rather than copied, into the returned String.
+
+        * wtf/text/WTFString.cpp:
+        (WTF::String::isolatedCopy):
+        * wtf/text/WTFString.h:
+
 2014-06-15  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WTF/wtf/text/WTFString.cpp

@@ -689 +689 @@
 }
 
-String String::isolatedCopy() const &&
+String String::isolatedCopy() &&
 {
     if (isSafeToSendToAnotherThread()) {

trunk/Source/WTF/wtf/text/WTFString.h

@@ -374 +374 @@
 #if COMPILER_SUPPORTS(CXX_REFERENCE_QUALIFIED_FUNCTIONS)
     WTF_EXPORT_STRING_API String isolatedCopy() const &;
-    WTF_EXPORT_STRING_API String isolatedCopy() const &&;
+    WTF_EXPORT_STRING_API String isolatedCopy() &&;
 #else
     WTF_EXPORT_STRING_API String isolatedCopy() const;

trunk/Tools/ChangeLog

@@ +1 @@
+2014-06-17  Dan Bernstein  <mitz@apple.com>
+
+        String::isolatedCopy doesn’t return an isolated copy when used on an rvalue reference
+        https://bugs.webkit.org/show_bug.cgi?id=133968
+
+        Reviewed by Anders Carlsson.
+
+        * TestWebKitAPI/Tests/WTF/WTFString.cpp:
+        (TestWebKitAPI::TEST): Added a test that an isolated copy of an rvalue reference doesn’t
+        share an impl() with the original.
+
 2014-06-17  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp

@@ -154 +154 @@
 }
 
+TEST(WTF, StringIsolatedCopy)
+{
+    String original = "1234";
+    auto copy = std::move(original).isolatedCopy();
+    ASSERT_FALSE(original.impl() == copy.impl());
+}
 
 } // namespace TestWebKitAPI