Changeset 203306 in webkit

Timestamp:

Jul 15, 2016, 3:38:30 PM (10 years ago)

Author:

Chris Dumez

Message:

Unreviewed, rolling out r203304.

This is wrong because of Node* entries in the internal HashMap

Reverted changeset:

"Add move constructor / assignment operator to ListHashSet"
​https://bugs.webkit.org/show_bug.cgi?id=159837
​http://trac.webkit.org/changeset/203304

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/ListHashSet.h (modified) (11 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-07-15  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r203304.
+
+        This is wrong because of Node* entries in the internal HashMap
+
+        Reverted changeset:
+
+        "Add move constructor / assignment operator to ListHashSet"
+        https://bugs.webkit.org/show_bug.cgi?id=159837
+        http://trac.webkit.org/changeset/203304
+
 2016-07-15  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WTF/wtf/ListHashSet.h

@@ -20 +20 @@
  */
 
-#pragma once
+#ifndef WTF_ListHashSet_h
+#define WTF_ListHashSet_h
 
 #include <wtf/HashSet.h>
@@ -69 +70 @@
     typedef HashTableAddResult<iterator> AddResult;
 
-    ListHashSet() = default;
+    ListHashSet();
     ListHashSet(const ListHashSet&);
-    ListHashSet(ListHashSet&&) = default;
     ListHashSet& operator=(const ListHashSet&);
-    ListHashSet& operator=(ListHashSet&&) = default;
     ~ListHashSet();
 
@@ -151 +150 @@
 
     HashTable<Node*, Node*, IdentityExtractor, NodeHash, NodeTraits, NodeTraits> m_impl;
-    Node* m_head { nullptr };
-    Node* m_tail { nullptr };
+    Node* m_head;
+    Node* m_tail;
 };
 
@@ -161 +160 @@
     ListHashSetNode(T&& value)
         : m_value(std::forward<T>(value))
+        , m_prev(0)
+        , m_next(0)
     {
     }
 
     ValueArg m_value;
-    ListHashSetNode* m_prev { nullptr };
-    ListHashSetNode* m_next { nullptr };
+    ListHashSetNode* m_prev;
+    ListHashSetNode* m_next;
 };
 
@@ -260 +261 @@
     const_iterator& operator++()
     {
-        ASSERT(m_position);
+        ASSERT(m_position != 0);
         m_position = m_position->m_next;
         return *this;
@@ -307 +308 @@
 
 template<typename T, typename U>
+inline ListHashSet<T, U>::ListHashSet()
+    : m_head(0)
+    , m_tail(0)
+{
+}
+
+template<typename T, typename U>
 inline ListHashSet<T, U>::ListHashSet(const ListHashSet& other)
+    : m_head(0)
+    , m_tail(0)
 {
     for (auto it = other.begin(), end = other.end(); it != end; ++it)
@@ -593 +603 @@
     deleteAllNodes();
     m_impl.clear(); 
-    m_head = nullptr;
-    m_tail = nullptr;
+    m_head = 0;
+    m_tail = 0;
 }
 
@@ -628 +638 @@
 {
     node->m_prev = m_tail;
-    node->m_next = nullptr;
+    node->m_next = 0;
 
     if (m_tail) {
@@ -644 +654 @@
 void ListHashSet<T, U>::prependNode(Node* node)
 {
-    node->m_prev = nullptr;
+    node->m_prev = 0;
     node->m_next = m_head;
 
@@ -677 +687 @@
         return;
 
-    for (Node* node = m_head, *next = m_head->m_next; node; node = next, next = node ? node->m_next : nullptr)
+    for (Node* node = m_head, *next = m_head->m_next; node; node = next, next = node ? node->m_next : 0)
         delete node;
 }
@@ -696 +706 @@
 
 using WTF::ListHashSet;
+
+#endif /* WTF_ListHashSet_h */