Index: src/isolate.cc |
diff --git a/src/isolate.cc b/src/isolate.cc |
index b760aebf07d549ef367e1bc063333606ca3ff569..2c32f46137067d3da88f657fe509b07e67cbe732 100644 |
--- a/src/isolate.cc |
+++ b/src/isolate.cc |
@@ -1999,7 +1999,7 @@ bool Isolate::Init(Deserializer* des) { |
InitializeThreadLocal(); |
bootstrapper_->Initialize(create_heap_objects); |
- builtins_.SetUp(create_heap_objects); |
+ builtins_.SetUp(create_heap_objects, false); |
// Only preallocate on the first initialization. |
if (FLAG_preallocate_message_memory && preallocated_message_space_ == NULL) { |
@@ -2024,7 +2024,11 @@ bool Isolate::Init(Deserializer* des) { |
// If we are deserializing, read the state into the now-empty heap. |
if (!create_heap_objects) { |
des->Deserialize(); |
+ |
+ // Set up builtins that are not included in snapshot. |
+ builtins_.SetUp(false, true); |
ulan
2012/12/17 10:44:52
This doesn't cover the case when snapshot is compl
hans
2012/12/17 12:31:44
That sounds like a good idea.
ulan
2012/12/17 13:03:36
Thanks, this part looks good now.
On 2012/12/17 12
|
} |
+ |
stub_cache_->Initialize(); |
// Finish initialization of ThreadLocal after deserialization is done. |