| Index: src/objects.cc
|
| diff --git a/src/objects.cc b/src/objects.cc
|
| index 21ed836cce1a21af3dace2c0cee605fb95db818d..014b22ebe3a0d17d1082ba82039043b661777f38 100644
|
| --- a/src/objects.cc
|
| +++ b/src/objects.cc
|
| @@ -10742,7 +10742,8 @@ void SharedFunctionInfo::StartInobjectSlackTracking(Map* map) {
|
| set_live_objects_may_exist(true);
|
|
|
| // No tracking during the snapshot construction phase.
|
| - if (Serializer::enabled()) return;
|
| + Isolate* isolate = GetIsolate();
|
| + if (Serializer::enabled(isolate)) return;
|
|
|
| if (map->unused_property_fields() == 0) return;
|
|
|
| @@ -10752,7 +10753,7 @@ void SharedFunctionInfo::StartInobjectSlackTracking(Map* map) {
|
| set_construction_count(kGenerousAllocationCount);
|
| }
|
| set_initial_map(map);
|
| - Builtins* builtins = map->GetHeap()->isolate()->builtins();
|
| + Builtins* builtins = isolate->builtins();
|
| ASSERT_EQ(builtins->builtin(Builtins::kJSConstructStubGeneric),
|
| construct_stub());
|
| set_construct_stub(builtins->builtin(Builtins::kJSConstructStubCountdown));
|
|
|