Index: src/arm/builtins-arm.cc |
diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc |
index c99e778a7f0469118269df8eb3ce697bbc185112..578bd810d4050c1be9b6cb1933a1e9bde0886060 100644 |
--- a/src/arm/builtins-arm.cc |
+++ b/src/arm/builtins-arm.cc |
@@ -114,7 +114,7 @@ static void AllocateEmptyJSArray(MacroAssembler* masm, |
Label* gc_required) { |
const int initial_capacity = JSArray::kPreallocatedArrayElements; |
STATIC_ASSERT(initial_capacity >= 0); |
- __ LoadInitialArrayMap(array_function, scratch2, scratch1); |
+ __ LoadInitialArrayMap(array_function, scratch2, scratch1, false); |
// Allocate the JSArray object together with space for a fixed array with the |
// requested elements. |
@@ -208,7 +208,8 @@ static void AllocateJSArray(MacroAssembler* masm, |
bool fill_with_hole, |
Label* gc_required) { |
// Load the initial map from the array function. |
- __ LoadInitialArrayMap(array_function, scratch2, elements_array_storage); |
+ __ LoadInitialArrayMap(array_function, scratch2, |
+ elements_array_storage, fill_with_hole); |
if (FLAG_debug_code) { // Assert that array size is not zero. |
__ tst(array_size, array_size); |
@@ -440,10 +441,10 @@ static void ArrayNativeCode(MacroAssembler* masm, |
__ b(call_generic_code); |
__ bind(¬_double); |
- // Transition FAST_SMI_ONLY_ELEMENTS to FAST_ELEMENTS. |
+ // Transition FAST_SMI_ELEMENTS to FAST_ELEMENTS. |
// r3: JSArray |
__ ldr(r2, FieldMemOperand(r3, HeapObject::kMapOffset)); |
- __ LoadTransitionedArrayMapConditional(FAST_SMI_ONLY_ELEMENTS, |
+ __ LoadTransitionedArrayMapConditional(FAST_SMI_ELEMENTS, |
FAST_ELEMENTS, |
r2, |
r9, |