Title: [273247] branches/safari-611-branch/Source/WTF
- Revision
- 273247
- Author
- [email protected]
- Date
- 2021-02-22 09:54:15 -0800 (Mon, 22 Feb 2021)
Log Message
Cherry-pick r272621. rdar://problem/74410131
REGRESSION(r269017): Speedometer2 1% regression
https://bugs.webkit.org/show_bug.cgi?id=221640
Reviewed by Mark Lam.
Reverting r269017, r269478, and r272095 because of Speedometer2 ~1% regression.
* wtf/HashTable.h:
(WTF::KeyTraits>::inlineLookup):
(WTF::KeyTraits>::lookupForWriting):
(WTF::KeyTraits>::fullLookupForWriting):
(WTF::KeyTraits>::addUniqueForInitialization):
(WTF::KeyTraits>::add):
* wtf/HashTraits.h:
* wtf/MetaAllocator.cpp:
(WTF::MetaAllocator::addFreeSpace):
* wtf/MetaAllocator.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272621 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611-branch/Source/WTF/ChangeLog (273246 => 273247)
--- branches/safari-611-branch/Source/WTF/ChangeLog 2021-02-22 17:54:12 UTC (rev 273246)
+++ branches/safari-611-branch/Source/WTF/ChangeLog 2021-02-22 17:54:15 UTC (rev 273247)
@@ -1,3 +1,47 @@
+2021-02-17 Ruben Turcios <[email protected]>
+
+ Cherry-pick r272621. rdar://problem/74410131
+
+ REGRESSION(r269017): Speedometer2 1% regression
+ https://bugs.webkit.org/show_bug.cgi?id=221640
+
+ Reviewed by Mark Lam.
+
+ Reverting r269017, r269478, and r272095 because of Speedometer2 ~1% regression.
+
+ * wtf/HashTable.h:
+ (WTF::KeyTraits>::inlineLookup):
+ (WTF::KeyTraits>::lookupForWriting):
+ (WTF::KeyTraits>::fullLookupForWriting):
+ (WTF::KeyTraits>::addUniqueForInitialization):
+ (WTF::KeyTraits>::add):
+ * wtf/HashTraits.h:
+ * wtf/MetaAllocator.cpp:
+ (WTF::MetaAllocator::addFreeSpace):
+ * wtf/MetaAllocator.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272621 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-02-09 Yusuke Suzuki <[email protected]>
+
+ REGRESSION(r269017): Speedometer2 1% regression
+ https://bugs.webkit.org/show_bug.cgi?id=221640
+
+ Reviewed by Mark Lam.
+
+ Reverting r269017, r269478, and r272095 because of Speedometer2 ~1% regression.
+
+ * wtf/HashTable.h:
+ (WTF::KeyTraits>::inlineLookup):
+ (WTF::KeyTraits>::lookupForWriting):
+ (WTF::KeyTraits>::fullLookupForWriting):
+ (WTF::KeyTraits>::addUniqueForInitialization):
+ (WTF::KeyTraits>::add):
+ * wtf/HashTraits.h:
+ * wtf/MetaAllocator.cpp:
+ (WTF::MetaAllocator::addFreeSpace):
+ * wtf/MetaAllocator.h:
+
2021-02-16 Ruben Turcios <[email protected]>
Cherry-pick r272703. rdar://problem/74409698
Modified: branches/safari-611-branch/Source/WTF/wtf/HashTable.h (273246 => 273247)
--- branches/safari-611-branch/Source/WTF/wtf/HashTable.h 2021-02-22 17:54:12 UTC (rev 273246)
+++ branches/safari-611-branch/Source/WTF/wtf/HashTable.h 2021-02-22 17:54:15 UTC (rev 273247)
@@ -59,8 +59,6 @@
#define CHECK_HASHTABLE_USE_AFTER_DESTRUCTION 1
#endif
-#define HASH_TABLE_RELEASE_ASSERT(condition) if (UNLIKELY(!(condition))) CRASH();
-
#if DUMP_HASHTABLE_STATS
struct HashTableStats {
@@ -677,7 +675,6 @@
unsigned sizeMask = tableSizeMask();
unsigned h = HashTranslator::hash(key);
unsigned i = h & sizeMask;
- unsigned initialIndex = i;
#if DUMP_HASHTABLE_STATS
++HashTableStats::numAccesses;
@@ -717,7 +714,6 @@
if (k == 0)
k = 1 | doubleHash(h);
i = (i + k) & sizeMask;
- HASH_TABLE_RELEASE_ASSERT(i != initialIndex);
}
}
@@ -733,7 +729,6 @@
unsigned sizeMask = tableSizeMask();
unsigned h = HashTranslator::hash(key);
unsigned i = h & sizeMask;
- unsigned initialIndex = i;
#if DUMP_HASHTABLE_STATS
++HashTableStats::numAccesses;
@@ -780,7 +775,6 @@
if (k == 0)
k = 1 | doubleHash(h);
i = (i + k) & sizeMask;
- HASH_TABLE_RELEASE_ASSERT(i != initialIndex);
}
}
@@ -796,7 +790,6 @@
unsigned sizeMask = tableSizeMask();
unsigned h = HashTranslator::hash(key);
unsigned i = h & sizeMask;
- unsigned initialIndex = i;
#if DUMP_HASHTABLE_STATS
++HashTableStats::numAccesses;
@@ -843,7 +836,6 @@
if (k == 0)
k = 1 | doubleHash(h);
i = (i + k) & sizeMask;
- HASH_TABLE_RELEASE_ASSERT(i != initialIndex);
}
}
@@ -864,7 +856,6 @@
unsigned sizeMask = tableSizeMask();
unsigned h = HashTranslator::hash(key);
unsigned i = h & sizeMask;
- unsigned initialIndex = i;
#if DUMP_HASHTABLE_STATS
++HashTableStats::numAccesses;
@@ -894,7 +885,6 @@
if (k == 0)
k = 1 | doubleHash(h);
i = (i + k) & sizeMask;
- HASH_TABLE_RELEASE_ASSERT(i != initialIndex);
}
HashTranslator::translate(*entry, std::forward<T>(key), std::forward<Extra>(extra));
@@ -947,7 +937,6 @@
unsigned sizeMask = tableSizeMask();
unsigned h = HashTranslator::hash(key);
unsigned i = h & sizeMask;
- unsigned initialIndex = i;
#if DUMP_HASHTABLE_STATS
++HashTableStats::numAccesses;
@@ -994,7 +983,6 @@
if (k == 0)
k = 1 | doubleHash(h);
i = (i + k) & sizeMask;
- HASH_TABLE_RELEASE_ASSERT(i != initialIndex);
}
if (deletedEntry) {
@@ -1653,8 +1641,6 @@
return a.m_impl != b.m_impl;
}
-#undef HASH_TABLE_RELEASE_ASSERT
-
} // namespace WTF
#include <wtf/HashIterators.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
