diff --git a/deps/v8z/include/v8-version.h b/deps/v8z/include/v8-version.h index 6cd4ac3b448..06846eece12 100644 --- a/deps/v8z/include/v8-version.h +++ b/deps/v8z/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 4 #define V8_MINOR_VERSION 5 #define V8_BUILD_NUMBER 103 -#define V8_PATCH_LEVEL 40 +#define V8_PATCH_LEVEL 41 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8z/src/objects.cc b/deps/v8z/src/objects.cc index d16c8e408c3..9e2d07e2634 100644 --- a/deps/v8z/src/objects.cc +++ b/deps/v8z/src/objects.cc @@ -13766,14 +13766,8 @@ Handle HashTable::EnsureCapacity( Isolate* isolate = table->GetIsolate(); int capacity = table->Capacity(); int nof = table->NumberOfElements() + n; - int nod = table->NumberOfDeletedElements(); - // Return if: - // 50% is still free after adding n elements and - // at most 50% of the free elements are deleted elements. - if (nod <= (capacity - nof) >> 1) { - int needed_free = nof >> 1; - if (nof + needed_free <= capacity) return table; - } + + if (table->HasSufficientCapacityToAdd(n)) return table; const int kMinCapacityForPretenure = 256; bool should_pretenure = pretenure == TENURED || @@ -13790,6 +13784,23 @@ Handle HashTable::EnsureCapacity( } +template +bool HashTable::HasSufficientCapacityToAdd( + int number_of_additional_elements) { + int capacity = Capacity(); + int nof = NumberOfElements() + number_of_additional_elements; + int nod = NumberOfDeletedElements(); + // Return true if: + // 50% is still free after adding number_of_additional_elements elements and + // at most 50% of the free elements are deleted elements. + if ((nof < capacity) && ((nod <= (capacity - nof) >> 1))) { + int needed_free = nof >> 1; + if (nof + needed_free <= capacity) return true; + } + return false; +} + + template Handle HashTable::Shrink(Handle table, Key key) { @@ -14827,7 +14838,7 @@ Dictionary::GenerateNewEnumerationIndices( } -template +template Handle Dictionary::EnsureCapacity( Handle dictionary, int n, Key key) { // Check whether there are enough enumeration indices to add n elements. @@ -15215,8 +15226,8 @@ Handle ObjectHashTable::Put(Handle table, } // If we're out of luck, we didn't get a GC recently, and so rehashing // isn't enough to avoid a crash. - int nof = table->NumberOfElements() + 1; - if (!table->HasSufficientCapacity(nof)) { + if (!table->HasSufficientCapacityToAdd(1)) { + int nof = table->NumberOfElements() + 1; int capacity = ObjectHashTable::ComputeCapacity(nof * 2); if (capacity > ObjectHashTable::kMaxCapacity) { for (size_t i = 0; i < 2; ++i) { diff --git a/deps/v8z/src/objects.h b/deps/v8z/src/objects.h index 3e5476f4a80..b8d2eeb0229 100644 --- a/deps/v8z/src/objects.h +++ b/deps/v8z/src/objects.h @@ -3116,6 +3116,9 @@ class HashTable : public HashTableBase { Key key, PretenureFlag pretenure = NOT_TENURED); + // Returns true if this table has sufficient capacity for adding n elements. + bool HasSufficientCapacityToAdd(int number_of_additional_elements); + // Sets the capacity of the hash table. void SetCapacity(int capacity) { // To scale a computed hash code to fit within the hash table, we