[webkit-changes] [261646] branches/safari-610.1.13-branch/Source/WTF

Wed, 13 May 2020 13:48:32 -0700

Title: [261646] branches/safari-610.1.13-branch/Source/WTF
Revision
261646
Author
[email protected]
Date
2020-05-13 13:47:18 -0700 (Wed, 13 May 2020)

Log Message

Cherry-pick r261486. rdar://problem/63195701

    Unreviewed, reverting r261440.

    Caused 6 TestWTF.WTF failures

    Reverted changeset:

    "Add iterator checking to ListHashSet"
    https://bugs.webkit.org/show_bug.cgi?id=211669
    https://trac.webkit.org/changeset/261440

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261486 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-610.1.13-branch/Source/WTF/ChangeLog (261645 => 261646)


--- branches/safari-610.1.13-branch/Source/WTF/ChangeLog	2020-05-13 20:47:16 UTC (rev 261645)
+++ branches/safari-610.1.13-branch/Source/WTF/ChangeLog	2020-05-13 20:47:18 UTC (rev 261646)
@@ -1,3 +1,31 @@
+2020-05-13  Alan Coon  <[email protected]>
+
+        Cherry-pick r261486. rdar://problem/63195701
+
+    Unreviewed, reverting r261440.
+    
+    Caused 6 TestWTF.WTF failures
+    
+    Reverted changeset:
+    
+    "Add iterator checking to ListHashSet"
+    https://bugs.webkit.org/show_bug.cgi?id=211669
+    https://trac.webkit.org/changeset/261440
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-05-11  Ryan Haddad  <[email protected]>
+
+            Unreviewed, reverting r261440.
+
+            Caused 6 TestWTF.WTF failures
+
+            Reverted changeset:
+
+            "Add iterator checking to ListHashSet"
+            https://bugs.webkit.org/show_bug.cgi?id=211669
+            https://trac.webkit.org/changeset/261440
+
 2020-05-10  Darin Adler  <[email protected]>
 
         Remove now-unneeded HAVE(CORE_VIDEO)

Modified: branches/safari-610.1.13-branch/Source/WTF/wtf/ListHashSet.h (261645 => 261646)


--- branches/safari-610.1.13-branch/Source/WTF/wtf/ListHashSet.h	2020-05-13 20:47:16 UTC (rev 261645)
+++ branches/safari-610.1.13-branch/Source/WTF/wtf/ListHashSet.h	2020-05-13 20:47:18 UTC (rev 261646)
@@ -23,10 +23,6 @@
 
 #include <wtf/HashSet.h>
 
-#if CHECK_HASHTABLE_ITERATORS
-#include <wtf/WeakPtr.h>
-#endif
-
 namespace WTF {
 
 // ListHashSet: Just like HashSet, this class provides a Set
@@ -49,11 +45,7 @@
 template<typename HashArg> struct ListHashSetNodeHashFunctions;
 template<typename HashArg> struct ListHashSetTranslator;
 
-template<typename ValueArg, typename HashArg = typename DefaultHash<ValueArg>::Hash> class ListHashSet final
-#if CHECK_HASHTABLE_ITERATORS
-    : public CanMakeWeakPtr<ListHashSet<ValueArg, HashArg>>
-#endif
-{
+template<typename ValueArg, typename HashArg = typename DefaultHash<ValueArg>::Hash> class ListHashSet final {
     WTF_MAKE_FAST_ALLOCATED;
 private:
     typedef ListHashSetNode<ValueArg> Node;
@@ -172,14 +164,11 @@
     Node* m_tail { nullptr };
 };
 
-template<typename ValueArg> struct ListHashSetNode
-#if CHECK_HASHTABLE_ITERATORS
-    : CanMakeWeakPtr<ListHashSetNode<ValueArg>>
-#endif
-{
-    WTF_MAKE_STRUCT_FAST_ALLOCATED;
-
-    template<typename T> ListHashSetNode(T&& value)
+template<typename ValueArg> struct ListHashSetNode {
+    WTF_MAKE_FAST_ALLOCATED;
+public:
+    template<typename T>
+    ListHashSetNode(T&& value)
         : m_value(std::forward<T>(value))
     {
     }
@@ -258,10 +247,6 @@
     ListHashSetConstIterator(const ListHashSetType* set, Node* position)
         : m_set(set)
         , m_position(position)
-#if CHECK_HASHTABLE_ITERATORS
-        , m_weakSet(makeWeakPtr(set))
-        , m_weakPosition(makeWeakPtr(position))
-#endif
     {
     }
 
@@ -278,9 +263,6 @@
 
     const ValueType* get() const
     {
-#if CHECK_HASHTABLE_ITERATORS
-        ASSERT(m_weakPosition);
-#endif
         return std::addressof(m_position->m_value);
     }
 
@@ -289,14 +271,8 @@
 
     const_iterator& operator++()
     {
-#if CHECK_HASHTABLE_ITERATORS
-        ASSERT(m_weakPosition);
-#endif
         ASSERT(m_position);
         m_position = m_position->m_next;
-#if CHECK_HASHTABLE_ITERATORS
-        m_weakPosition = makeWeakPtr(m_position);
-#endif
         return *this;
     }
 
@@ -304,18 +280,11 @@
 
     const_iterator& operator--()
     {
-#if CHECK_HASHTABLE_ITERATORS
-        ASSERT(m_weakSet);
-        m_weakPosition.get();
-#endif
         ASSERT(m_position != m_set->m_head);
         if (!m_position)
             m_position = m_set->m_tail;
         else
             m_position = m_position->m_prev;
-#if CHECK_HASHTABLE_ITERATORS
-        m_weakPosition = makeWeakPtr(m_position);
-#endif
         return *this;
     }
 
@@ -334,12 +303,8 @@
 private:
     Node* node() { return m_position; }
 
-    const ListHashSetType* m_set { nullptr };
-    Node* m_position { nullptr };
-#if CHECK_HASHTABLE_ITERATORS
-    WeakPtr<const ListHashSetType> m_weakSet;
-    WeakPtr<Node> m_weakPosition;
-#endif
+    const ListHashSetType* m_set;
+    Node* m_position;
 };
 
 template<typename HashFunctions>

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to