Changeset 207070 in webkit

Timestamp:

Oct 11, 2016 2:18:15 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r205836 - [WTF] HashTable's rehash is not compatible to Ref<T> and ASan
​https://bugs.webkit.org/show_bug.cgi?id=161763

Reviewed by Darin Adler.

Destructors of HashTable's empty values need to be called while ones of deleted values don't.

• wtf/HashTable.h:

(WTF::KeyTraits>::deallocateTable):

• wtf/Ref.h:

Location:

releases/WebKitGTK/webkit-2.14/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/HashTable.h (modified) (2 diffs)
• wtf/Ref.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.14/Source/WTF/ChangeLog

@@ +1 @@
+2016-09-12  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [WTF] HashTable's rehash is not compatible to Ref<T> and ASan
+        https://bugs.webkit.org/show_bug.cgi?id=161763
+
+        Reviewed by Darin Adler.
+
+        Destructors of HashTable's empty values need to be called while ones of deleted values don't.
+
+        * wtf/HashTable.h:
+        (WTF::KeyTraits>::deallocateTable):
+        * wtf/Ref.h:
+
 2016-09-09  Mark Lam  <mark.lam@apple.com>
 

releases/WebKitGTK/webkit-2.14/Source/WTF/wtf/HashTable.h

@@ -1154 +1154 @@
     {
         for (unsigned i = 0; i < size; ++i) {
-            if (!isEmptyOrDeletedBucket(table[i]))
+            if (!isDeletedBucket(table[i]))
                 table[i].~ValueType();
         }
@@ -1198 +1198 @@
         Value* newEntry = nullptr;
         for (unsigned i = 0; i != oldTableSize; ++i) {
-            if (isEmptyOrDeletedBucket(oldTable[i])) {
+            if (isDeletedBucket(oldTable[i])) {
                 ASSERT(std::addressof(oldTable[i]) != entry);
+                continue;
+            }
+
+            if (isEmptyBucket(oldTable[i])) {
+                ASSERT(std::addressof(oldTable[i]) != entry);
+                oldTable[i].~ValueType();
                 continue;
             }

releases/WebKitGTK/webkit-2.14/Source/WTF/wtf/Ref.h

@@ -115 +115 @@
     }
 
-    // Hash table deleted/empty values, which are only constructed and never copied or destroyed.
+    // Hash table deleted values, which are only constructed and never copied or destroyed.
     Ref(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) { }
     bool isHashTableDeletedValue() const { return m_ptr == hashTableDeletedValue(); }