| Index: src/bootstrapper.cc
|
| diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
|
| index dd77c14e3f9239ca678ca0b2282033f09ee5a312..6d22ab236d357608483c44ac38eb1e08c194590f 100644
|
| --- a/src/bootstrapper.cc
|
| +++ b/src/bootstrapper.cc
|
| @@ -475,6 +475,10 @@ Handle<JSFunction> Genesis::CreateEmptyFunction(Isolate* isolate) {
|
| TENURED);
|
|
|
| native_context()->set_initial_object_prototype(*prototype);
|
| + // For bootstrapping set the array prototype to be the same as the object
|
| + // prototype, otherwise the missing initial_array_prototype will cause
|
| + // assertions during startup.
|
| + native_context()->set_initial_array_prototype(*prototype);
|
| SetPrototype(object_fun, prototype);
|
| }
|
|
|
| @@ -2365,6 +2369,10 @@ bool Genesis::ConfigureGlobalObjects(
|
| }
|
|
|
| SetObjectPrototype(global_proxy, inner_global);
|
| +
|
| + native_context()->set_initial_array_prototype(
|
| + JSArray::cast(native_context()->array_function()->prototype()));
|
| +
|
| return true;
|
| }
|
|
|
|
|