| Index: src/arm/builtins-arm.cc
|
| ===================================================================
|
| --- src/arm/builtins-arm.cc (revision 4616)
|
| +++ src/arm/builtins-arm.cc (working copy)
|
| @@ -107,7 +107,7 @@
|
| // Allocate the JSArray object together with space for a fixed array with the
|
| // requested elements.
|
| int size = JSArray::kSize + FixedArray::SizeFor(initial_capacity);
|
| - __ AllocateInNewSpace(size / kPointerSize,
|
| + __ AllocateInNewSpace(size,
|
| result,
|
| scratch2,
|
| scratch3,
|
| @@ -191,7 +191,7 @@
|
| // keeps the code below free of special casing for the empty array.
|
| int size = JSArray::kSize +
|
| FixedArray::SizeFor(JSArray::kPreallocatedArrayElements);
|
| - __ AllocateInNewSpace(size / kPointerSize,
|
| + __ AllocateInNewSpace(size,
|
| result,
|
| elements_array_end,
|
| scratch1,
|
| @@ -208,12 +208,13 @@
|
| __ add(elements_array_end,
|
| elements_array_end,
|
| Operand(array_size, ASR, kSmiTagSize));
|
| - __ AllocateInNewSpace(elements_array_end,
|
| - result,
|
| - scratch1,
|
| - scratch2,
|
| - gc_required,
|
| - TAG_OBJECT);
|
| + __ AllocateInNewSpace(
|
| + elements_array_end,
|
| + result,
|
| + scratch1,
|
| + scratch2,
|
| + gc_required,
|
| + static_cast<AllocationFlags>(TAG_OBJECT | SIZE_IN_WORDS));
|
|
|
| // Allocated the JSArray. Now initialize the fields except for the elements
|
| // array.
|
| @@ -561,7 +562,7 @@
|
| // r2: initial map
|
| // r7: undefined
|
| __ ldrb(r3, FieldMemOperand(r2, Map::kInstanceSizeOffset));
|
| - __ AllocateInNewSpace(r3, r4, r5, r6, &rt_call, NO_ALLOCATION_FLAGS);
|
| + __ AllocateInNewSpace(r3, r4, r5, r6, &rt_call, SIZE_IN_WORDS);
|
|
|
| // Allocated the JSObject, now initialize the fields. Map is set to initial
|
| // map and properties and elements are set to empty fixed array.
|
| @@ -632,12 +633,13 @@
|
| // r5: start of next object
|
| // r7: undefined
|
| __ add(r0, r3, Operand(FixedArray::kHeaderSize / kPointerSize));
|
| - __ AllocateInNewSpace(r0,
|
| - r5,
|
| - r6,
|
| - r2,
|
| - &undo_allocation,
|
| - RESULT_CONTAINS_TOP);
|
| + __ AllocateInNewSpace(
|
| + r0,
|
| + r5,
|
| + r6,
|
| + r2,
|
| + &undo_allocation,
|
| + static_cast<AllocationFlags>(RESULT_CONTAINS_TOP | SIZE_IN_WORDS));
|
|
|
| // Initialize the FixedArray.
|
| // r1: constructor
|
|
|