Changeset 207237 in webkit

Timestamp:

Oct 12, 2016 1:38:37 PM (8 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r207225.

This change causes debug tests to exit early with crashes.

Reverted changeset:

"Optional's move-constructor and move-assignment operator
don't disengage the value being moved from"
​https://bugs.webkit.org/show_bug.cgi?id=163309
​http://trac.webkit.org/changeset/207225

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/Optional.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/Optional.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-10-12  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r207225.
+
+        This change causes debug tests to exit early with crashes.
+
+        Reverted changeset:
+
+        "Optional's move-constructor and move-assignment operator
+        don't disengage the value being moved from"
+        https://bugs.webkit.org/show_bug.cgi?id=163309
+        http://trac.webkit.org/changeset/207225
+
 2016-10-11  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WTF/wtf/Optional.h

@@ -72 +72 @@
         : m_isEngaged(other.m_isEngaged)
     {
-        if (m_isEngaged) {
+        if (m_isEngaged)
             new (NotNull, &m_value) T(WTFMove(*other.asPtr()));
-            other.m_isEngaged = false;
-        }
     }
 
@@ -124 +122 @@
             new (NotNull, &m_value) T(WTFMove(*other.asPtr()));
             m_isEngaged = true;
-            other.m_isEngaged = false;
         }
         return *this;

trunk/Tools/ChangeLog

@@ +1 @@
+2016-10-12  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r207225.
+
+        This change causes debug tests to exit early with crashes.
+
+        Reverted changeset:
+
+        "Optional's move-constructor and move-assignment operator
+        don't disengage the value being moved from"
+        https://bugs.webkit.org/show_bug.cgi?id=163309
+        http://trac.webkit.org/changeset/207225
+
 2016-10-12  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -26 +26 @@
 #include "config.h"
 
-#include "Counters.h"
 #include <wtf/Optional.h>
 
@@ -148 +147 @@
 }
 
-TEST(WTF_Optional, MoveConstructor)
-{
-    {
-        CopyMoveCounter::TestingScope scope;
-
-        Optional<CopyMoveCounter> optional(InPlace);
-
-        EXPECT_EQ(1U, CopyMoveCounter::constructionCount);
-        EXPECT_EQ(0U, CopyMoveCounter::copyCount);
-        EXPECT_EQ(0U, CopyMoveCounter::moveCount);
-
-        EXPECT_TRUE(static_cast<bool>(optional));
-    
-        Optional<CopyMoveCounter> movedTo(WTFMove(optional));
-
-        EXPECT_EQ(1U, CopyMoveCounter::constructionCount);
-        EXPECT_EQ(0U, CopyMoveCounter::copyCount);
-        EXPECT_EQ(1U, CopyMoveCounter::moveCount);
-
-        EXPECT_FALSE(static_cast<bool>(optional));
-        EXPECT_TRUE(static_cast<bool>(movedTo));
-    }
-}
-
-TEST(WTF_Optional, MoveAssignment)
-{
-    {
-        CopyMoveCounter::TestingScope scope;
-
-        Optional<CopyMoveCounter> optional(InPlace);
-
-        EXPECT_EQ(1U, CopyMoveCounter::constructionCount);
-        EXPECT_EQ(0U, CopyMoveCounter::copyCount);
-        EXPECT_EQ(0U, CopyMoveCounter::moveCount);
-
-        EXPECT_TRUE(static_cast<bool>(optional));
-    
-        Optional<CopyMoveCounter> movedTo = WTFMove(optional);
-
-        EXPECT_EQ(1U, CopyMoveCounter::constructionCount);
-        EXPECT_EQ(0U, CopyMoveCounter::copyCount);
-        EXPECT_EQ(1U, CopyMoveCounter::moveCount);
-
-        EXPECT_FALSE(static_cast<bool>(optional));
-        EXPECT_TRUE(static_cast<bool>(movedTo));
-    }
-}
 
 } // namespace TestWebKitAPI