Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(920)

Unified Diff: src/isolate.cc

Issue 2289493002: Revert of "[heap] Switch to 500k pages" (Closed)
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/heap/spaces.cc ('k') | src/objects.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/isolate.cc
diff --git a/src/isolate.cc b/src/isolate.cc
index 5876af004fc56d7be5cccb9e1d9b360e43c71f20..10835256ccc9d2e021de96cd5a9c8917c7f911ed 100644
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -2409,19 +2409,13 @@
runtime_profiler_ = new RuntimeProfiler(this);
// If we are deserializing, read the state into the now-empty heap.
- {
- AlwaysAllocateScope always_allocate(this);
-
- if (!create_heap_objects) {
- des->Deserialize(this);
- }
- load_stub_cache_->Initialize();
- store_stub_cache_->Initialize();
- if (FLAG_ignition || serializer_enabled()) {
- interpreter_->Initialize();
- }
-
- heap_.NotifyDeserializationComplete();
+ if (!create_heap_objects) {
+ des->Deserialize(this);
+ }
+ load_stub_cache_->Initialize();
+ store_stub_cache_->Initialize();
+ if (FLAG_ignition || serializer_enabled()) {
+ interpreter_->Initialize();
}
// Finish initialization of ThreadLocal after deserialization is done.
@@ -2451,6 +2445,8 @@
Internals::kExternalMemoryLimitOffset);
time_millis_at_init_ = heap_.MonotonicallyIncreasingTimeInMs();
+
+ heap_.NotifyDeserializationComplete();
if (!create_heap_objects) {
// Now that the heap is consistent, it's OK to generate the code for the
« no previous file with comments | « src/heap/spaces.cc ('k') | src/objects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698