Changeset 170999 in webkit


Ignore:
Timestamp:
Jul 11, 2014 5:26:08 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r170995.
https://bugs.webkit.org/show_bug.cgi?id=134831

Causing odd crashes in debug builds (Requested by zdobersek on
#webkit).

Reverted changeset:

"[WTF] Add the move constructor, move assignment operator for
HashTable"
https://bugs.webkit.org/show_bug.cgi?id=130772
http://trac.webkit.org/changeset/170995

Location:
trunk/Source/WTF
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WTF/ChangeLog

    r170995 r170999  
     12014-07-11  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r170995.
     4        https://bugs.webkit.org/show_bug.cgi?id=134831
     5
     6        Causing odd crashes in debug builds (Requested by zdobersek on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "[WTF] Add the move constructor, move assignment operator for
     12        HashTable"
     13        https://bugs.webkit.org/show_bug.cgi?id=130772
     14        http://trac.webkit.org/changeset/170995
     15
    1162014-07-09  Zan Dobersek  <zdobersek@igalia.com>
    217
  • trunk/Source/WTF/wtf/HashTable.h

    r170995 r170999  
    360360        void swap(HashTable&);
    361361        HashTable& operator=(const HashTable&);
    362 
    363         HashTable(HashTable&&);
    364         HashTable& operator=(HashTable&&);
    365362
    366363        // When the hash table is empty, just return the same iterator for end as for begin.
     
    11801177    }
    11811178
    1182     template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
    1183     inline HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::HashTable(HashTable&& other)
    1184 #if CHECK_HASHTABLE_ITERATORS
    1185         : m_iterators(nullptr)
    1186         , m_mutex(std::make_unique<std::mutex>())
    1187 #endif
    1188     {
    1189         other.invalidateIterators();
    1190 
    1191         m_table = other.m_table;
    1192         m_tableSize = other.m_tableSize;
    1193         m_tableSizeMask = other.m_tableSizeMask;
    1194         m_keyCount = other.m_keyCount;
    1195         m_deletedCount = other.m_deletedCount;
    1196 
    1197         other.m_table = nullptr;
    1198         other.m_tableSize = 0;
    1199         other.m_tableSizeMask = 0;
    1200         other.m_keyCount = 0;
    1201         other.m_deletedCount = 0;
    1202 
    1203 #if DUMP_HASHTABLE_STATS_PER_TABLE
    1204         m_stats = std::move(other.m_stats);
    1205 #endif
    1206     }
    1207 
    1208     template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
    1209     inline auto HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::operator=(HashTable&& other) -> HashTable&
    1210     {
    1211         invalidateIterators();
    1212         other.invalidateIterators();
    1213 
    1214         m_table = other.m_table;
    1215         m_tableSize = other.m_tableSize;
    1216         m_tableSizeMask = other.m_tableSizeMask;
    1217         m_keyCount = other.m_keyCount;
    1218         m_deletedCount = other.m_deletedCount;
    1219 
    1220         other.m_table = nullptr;
    1221         other.m_tableSize = 0;
    1222         other.m_tableSizeMask = 0;
    1223         other.m_keyCount = 0;
    1224         other.m_deletedCount = 0;
    1225 
    1226 #if DUMP_HASHTABLE_STATS_PER_TABLE
    1227         m_stats = std::move(other.m_stats);
    1228 #endif
    1229 
    1230         return *this;
    1231     }
    1232 
    12331179#if !ASSERT_DISABLED
    12341180
Note: See TracChangeset for help on using the changeset viewer.