Remove serializer-specific hash table size heuristic.
The heuristic can cause weird behavior when bootstrapping. The memory savings is not worth this hassle. Committed: https://crrev.com/fc80f29a582b758d14aae864232624ca45e47ddc Cr-Commit-Position: refs/heads/master@{#30019} Review URL: https://codereview.chromium.org/1265983006 Cr-Commit-Position: refs/heads/master@{#30026}
This commit is contained in:
parent
4273f66e98
commit
6a2d3ad606
@ -367,14 +367,12 @@ StartupData V8::CreateSnapshotDataBlob(const char* custom_source) {
|
||||
base::ElapsedTimer timer;
|
||||
timer.Start();
|
||||
Isolate::Scope isolate_scope(isolate);
|
||||
internal_isolate->set_creating_default_snapshot(true);
|
||||
internal_isolate->Init(NULL);
|
||||
Persistent<Context> context;
|
||||
i::Snapshot::Metadata metadata;
|
||||
{
|
||||
HandleScope handle_scope(isolate);
|
||||
Local<Context> new_context = Context::New(isolate);
|
||||
internal_isolate->set_creating_default_snapshot(false);
|
||||
context.Reset(isolate, new_context);
|
||||
if (custom_source != NULL) {
|
||||
metadata.set_embeds_script(true);
|
||||
|
@ -2408,7 +2408,8 @@ bool Genesis::InstallNatives(ContextType context_type) {
|
||||
InstallNativeFunctions();
|
||||
|
||||
auto function_cache =
|
||||
ObjectHashTable::New(isolate(), ApiNatives::kInitialFunctionCacheSize);
|
||||
ObjectHashTable::New(isolate(), ApiNatives::kInitialFunctionCacheSize,
|
||||
USE_CUSTOM_MINIMUM_CAPACITY);
|
||||
native_context()->set_function_cache(*function_cache);
|
||||
|
||||
// Store the map for the string prototype after the natives has been compiled
|
||||
|
@ -384,7 +384,6 @@ typedef List<HeapObject*> DebugObjectCache;
|
||||
V(uint32_t, per_isolate_assert_data, 0xFFFFFFFFu) \
|
||||
V(PromiseRejectCallback, promise_reject_callback, NULL) \
|
||||
V(const v8::StartupData*, snapshot_blob, NULL) \
|
||||
V(bool, creating_default_snapshot, false) \
|
||||
ISOLATE_INIT_SIMULATOR_LIST(V)
|
||||
|
||||
#define THREAD_LOCAL_TOP_ACCESSOR(type, name) \
|
||||
|
@ -2996,13 +2996,6 @@ int HashTableBase::ComputeCapacity(int at_least_space_for) {
|
||||
}
|
||||
|
||||
|
||||
int HashTableBase::ComputeCapacityForSerialization(int at_least_space_for) {
|
||||
const int kMinCapacity = 1;
|
||||
int capacity = base::bits::RoundUpToPowerOfTwo32(at_least_space_for);
|
||||
return Max(capacity, kMinCapacity);
|
||||
}
|
||||
|
||||
|
||||
template <typename Derived, typename Shape, typename Key>
|
||||
int HashTable<Derived, Shape, Key>::FindEntry(Key key) {
|
||||
return FindEntry(GetIsolate(), key);
|
||||
|
@ -13438,9 +13438,7 @@ Handle<Derived> HashTable<Derived, Shape, Key>::New(
|
||||
|
||||
int capacity = (capacity_option == USE_CUSTOM_MINIMUM_CAPACITY)
|
||||
? at_least_space_for
|
||||
: isolate->creating_default_snapshot()
|
||||
? ComputeCapacityForSerialization(at_least_space_for)
|
||||
: ComputeCapacity(at_least_space_for);
|
||||
: ComputeCapacity(at_least_space_for);
|
||||
if (capacity > HashTable::kMaxCapacity) {
|
||||
v8::internal::Heap::FatalProcessOutOfMemory("invalid table size", true);
|
||||
}
|
||||
|
@ -2950,9 +2950,6 @@ class HashTableBase : public FixedArray {
|
||||
// number of elements. May be more than HashTable::kMaxCapacity.
|
||||
static inline int ComputeCapacity(int at_least_space_for);
|
||||
|
||||
// Use a different heuristic to compute capacity when serializing.
|
||||
static inline int ComputeCapacityForSerialization(int at_least_space_for);
|
||||
|
||||
// Tells whether k is a real key. The hole and undefined are not allowed
|
||||
// as keys and can be used to indicate missing or deleted elements.
|
||||
bool IsKey(Object* k) {
|
||||
|
@ -314,6 +314,9 @@
|
||||
|
||||
# BUG(v8:4237)
|
||||
'regress/regress-3976': [SKIP],
|
||||
|
||||
# BUG(v8:4359)
|
||||
'strong/load-proxy': [SKIP],
|
||||
}], # 'gc_stress == True'
|
||||
|
||||
##############################################################################
|
||||
|
Loading…
Reference in New Issue
Block a user