Index: src/snapshot/serialize.cc |
diff --git a/src/snapshot/serialize.cc b/src/snapshot/serialize.cc |
index ffc8b7880922d3391bf871ad780b465cfcb0aab8..8cb4b73150a8fea7e9fc0aada707c5146d3c233e 100644 |
--- a/src/snapshot/serialize.cc |
+++ b/src/snapshot/serialize.cc |
@@ -1701,8 +1701,14 @@ void StartupSerializer::SerializeObject(HeapObject* obj, HowToCode how_to_code, |
return; |
} |
- if (obj->IsCode() && Code::cast(obj)->kind() == Code::FUNCTION) { |
- obj = isolate()->builtins()->builtin(Builtins::kCompileLazy); |
+ if (obj->IsCode()) { |
+ Builtins* builtins = isolate()->builtins(); |
+ if (Code::cast(obj)->kind() == Code::FUNCTION || |
+ obj == builtins->builtin(Builtins::kInterpreterEntryTrampoline)) { |
Michael Starzinger
2016/02/03 12:39:26
nit: Can we use the Code::is_interpreter_entry_tra
|
+ obj = builtins->builtin(Builtins::kCompileLazy); |
+ } |
+ } else if (obj->IsBytecodeArray()) { |
+ obj = isolate()->heap()->undefined_value(); |
} |
if (SerializeKnownObject(obj, how_to_code, where_to_point, skip)) return; |