| Index: src/arm/builtins-arm.cc
|
| diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc
|
| index 2a650a44a5ad0a973bb2f1ab2eaf6680becf4f57..349aed8fd30d9552cea2e8e9560d07c60e5e2b46 100644
|
| --- a/src/arm/builtins-arm.cc
|
| +++ b/src/arm/builtins-arm.cc
|
| @@ -114,9 +114,7 @@ static void AllocateEmptyJSArray(MacroAssembler* masm,
|
| Label* gc_required) {
|
| const int initial_capacity = JSArray::kPreallocatedArrayElements;
|
| STATIC_ASSERT(initial_capacity >= 0);
|
| - // Load the initial map from the array function.
|
| - __ ldr(scratch1, FieldMemOperand(array_function,
|
| - JSFunction::kPrototypeOrInitialMapOffset));
|
| + __ LoadGlobalInitialConstructedArrayMap(array_function, scratch2, scratch1);
|
|
|
| // Allocate the JSArray object together with space for a fixed array with the
|
| // requested elements.
|
| @@ -210,9 +208,8 @@ static void AllocateJSArray(MacroAssembler* masm,
|
| bool fill_with_hole,
|
| Label* gc_required) {
|
| // Load the initial map from the array function.
|
| - __ ldr(elements_array_storage,
|
| - FieldMemOperand(array_function,
|
| - JSFunction::kPrototypeOrInitialMapOffset));
|
| + __ LoadGlobalInitialConstructedArrayMap(array_function, scratch2,
|
| + elements_array_storage);
|
|
|
| if (FLAG_debug_code) { // Assert that array size is not zero.
|
| __ tst(array_size, array_size);
|
|
|