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

Unified Diff: src/isolate.cc

Issue 2232653003: Reland of "[heap] Switch to 500k pages" (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Add cctests 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 859d91381b1c290b2b14a9523656739a82bef2e7..7474a55e432f7e2239d10fa1da59855c39db6b12 100644
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -2438,13 +2438,19 @@ bool Isolate::Init(Deserializer* des) {
runtime_profiler_ = new RuntimeProfiler(this);
// If we are deserializing, read the state into the now-empty heap.
- if (!create_heap_objects) {
- des->Deserialize(this);
- }
- load_stub_cache_->Initialize();
- store_stub_cache_->Initialize();
- if (FLAG_ignition || serializer_enabled()) {
- interpreter_->Initialize();
+ {
+ 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();
}
// Finish initialization of ThreadLocal after deserialization is done.
@@ -2475,8 +2481,6 @@ bool Isolate::Init(Deserializer* des) {
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
// deopt entry table that might have been referred to by optimized code in
« 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