Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index 4da2fece03bf4dce029d5e4a4c836e16cffdfd95..b4aec54555685299750d5d2e37b909bbd01c9cd1 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -1868,10 +1868,12 @@ void MacroAssembler::CompareRoot(Register obj, |
void MacroAssembler::CheckFastElements(Register map, |
Register scratch, |
Label* fail) { |
- STATIC_ASSERT(FAST_SMI_ONLY_ELEMENTS == 0); |
- STATIC_ASSERT(FAST_ELEMENTS == 1); |
+ STATIC_ASSERT(FAST_SMI_ELEMENTS == 0); |
+ STATIC_ASSERT(FAST_HOLEY_SMI_ELEMENTS == 1); |
+ STATIC_ASSERT(FAST_ELEMENTS == 2); |
+ STATIC_ASSERT(FAST_HOLEY_ELEMENTS == 3); |
ldrb(scratch, FieldMemOperand(map, Map::kBitField2Offset)); |
- cmp(scratch, Operand(Map::kMaximumBitField2FastElementValue)); |
+ cmp(scratch, Operand(Map::kMaximumBitField2FastHoleyElementValue)); |
b(hi, fail); |
} |
@@ -1879,22 +1881,25 @@ void MacroAssembler::CheckFastElements(Register map, |
void MacroAssembler::CheckFastObjectElements(Register map, |
Register scratch, |
Label* fail) { |
- STATIC_ASSERT(FAST_SMI_ONLY_ELEMENTS == 0); |
- STATIC_ASSERT(FAST_ELEMENTS == 1); |
+ STATIC_ASSERT(FAST_SMI_ELEMENTS == 0); |
+ STATIC_ASSERT(FAST_HOLEY_SMI_ELEMENTS == 1); |
+ STATIC_ASSERT(FAST_ELEMENTS == 2); |
+ STATIC_ASSERT(FAST_HOLEY_ELEMENTS == 3); |
ldrb(scratch, FieldMemOperand(map, Map::kBitField2Offset)); |
- cmp(scratch, Operand(Map::kMaximumBitField2FastSmiOnlyElementValue)); |
+ cmp(scratch, Operand(Map::kMaximumBitField2FastHoleySmiElementValue)); |
b(ls, fail); |
- cmp(scratch, Operand(Map::kMaximumBitField2FastElementValue)); |
+ cmp(scratch, Operand(Map::kMaximumBitField2FastHoleyElementValue)); |
b(hi, fail); |
} |
-void MacroAssembler::CheckFastSmiOnlyElements(Register map, |
- Register scratch, |
- Label* fail) { |
- STATIC_ASSERT(FAST_SMI_ONLY_ELEMENTS == 0); |
+void MacroAssembler::CheckFastSmiElements(Register map, |
+ Register scratch, |
+ Label* fail) { |
+ STATIC_ASSERT(FAST_SMI_ELEMENTS == 0); |
+ STATIC_ASSERT(FAST_HOLEY_SMI_ELEMENTS == 1); |
ldrb(scratch, FieldMemOperand(map, Map::kBitField2Offset)); |
- cmp(scratch, Operand(Map::kMaximumBitField2FastSmiOnlyElementValue)); |
+ cmp(scratch, Operand(Map::kMaximumBitField2FastHoleySmiElementValue)); |
b(hi, fail); |
} |
@@ -1997,22 +2002,17 @@ void MacroAssembler::CompareMap(Register obj, |
ldr(scratch, FieldMemOperand(obj, HeapObject::kMapOffset)); |
cmp(scratch, Operand(map)); |
if (mode == ALLOW_ELEMENT_TRANSITION_MAPS) { |
- Map* transitioned_fast_element_map( |
- map->LookupElementsTransitionMap(FAST_ELEMENTS, NULL)); |
- ASSERT(transitioned_fast_element_map == NULL || |
- map->elements_kind() != FAST_ELEMENTS); |
- if (transitioned_fast_element_map != NULL) { |
- b(eq, early_success); |
- cmp(scratch, Operand(Handle<Map>(transitioned_fast_element_map))); |
- } |
- |
- Map* transitioned_double_map( |
- map->LookupElementsTransitionMap(FAST_DOUBLE_ELEMENTS, NULL)); |
- ASSERT(transitioned_double_map == NULL || |
- map->elements_kind() == FAST_SMI_ONLY_ELEMENTS); |
- if (transitioned_double_map != NULL) { |
- b(eq, early_success); |
- cmp(scratch, Operand(Handle<Map>(transitioned_double_map))); |
+ ElementsKind kind = map->elements_kind(); |
+ if (IsFastElementsKind(kind)) { |
+ bool packed = IsFastPackedElementsKind(kind); |
+ Map* current_map = *map; |
+ while (CanTransitionToMoreGeneralFastElementsKind(kind, packed)) { |
+ kind = GetNextMoreGeneralFastElementsKind(kind, packed); |
+ current_map = current_map->LookupElementsTransitionMap(kind, NULL); |
+ if (!current_map) break; |
+ b(eq, early_success); |
+ cmp(scratch, Operand(Handle<Map>(current_map))); |
+ } |
} |
} |
} |
@@ -2865,28 +2865,38 @@ void MacroAssembler::LoadTransitionedArrayMapConditional( |
ldr(scratch, FieldMemOperand(scratch, GlobalObject::kGlobalContextOffset)); |
// Check that the function's map is the same as the expected cached map. |
- int expected_index = |
- Context::GetContextMapIndexFromElementsKind(expected_kind); |
- ldr(ip, MemOperand(scratch, Context::SlotOffset(expected_index))); |
- cmp(map_in_out, ip); |
+ ldr(scratch, |
+ MemOperand(scratch, |
+ Context::SlotOffset(Context::JS_ARRAY_MAPS_INDEX))); |
+ size_t offset = expected_kind * kPointerSize + |
+ FixedArrayBase::kHeaderSize; |
+ cmp(map_in_out, scratch); |
b(ne, no_map_match); |
// Use the transitioned cached map. |
- int trans_index = |
- Context::GetContextMapIndexFromElementsKind(transitioned_kind); |
- ldr(map_in_out, MemOperand(scratch, Context::SlotOffset(trans_index))); |
+ offset = transitioned_kind * kPointerSize + |
+ FixedArrayBase::kHeaderSize; |
+ ldr(map_in_out, FieldMemOperand(scratch, offset)); |
} |
void MacroAssembler::LoadInitialArrayMap( |
- Register function_in, Register scratch, Register map_out) { |
+ Register function_in, Register scratch, |
+ Register map_out, bool can_have_holes) { |
ASSERT(!function_in.is(map_out)); |
Label done; |
ldr(map_out, FieldMemOperand(function_in, |
JSFunction::kPrototypeOrInitialMapOffset)); |
if (!FLAG_smi_only_arrays) { |
- LoadTransitionedArrayMapConditional(FAST_SMI_ONLY_ELEMENTS, |
- FAST_ELEMENTS, |
+ ElementsKind kind = can_have_holes ? FAST_HOLEY_ELEMENTS : FAST_ELEMENTS; |
+ LoadTransitionedArrayMapConditional(FAST_SMI_ELEMENTS, |
+ kind, |
+ map_out, |
+ scratch, |
+ &done); |
+ } else if (can_have_holes) { |
+ LoadTransitionedArrayMapConditional(FAST_SMI_ELEMENTS, |
+ FAST_HOLEY_SMI_ELEMENTS, |
map_out, |
scratch, |
&done); |