| 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
|
|
|