Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index fa58146a48b481205b0a7fa51493e514149c1ce1..18f2a39a83cd1a85ae13f0a63699aaef89cb237f 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -2377,8 +2377,10 @@ void LCodeGen::DoLoadElements(LLoadElements* instr) { |
__ movzx_b(temp, FieldOperand(temp, Map::kBitField2Offset)); |
__ and_(temp, Map::kElementsKindMask); |
__ shr(temp, Map::kElementsKindShift); |
- __ cmp(temp, FAST_ELEMENTS); |
- __ j(equal, &ok, Label::kNear); |
+ __ cmp(temp, GetInitialFastElementsKind()); |
+ __ j(less, &fail, Label::kNear); |
+ __ cmp(temp, TERMINAL_FAST_ELEMENTS_KIND); |
+ __ j(less_equal, &ok, Label::kNear); |
__ cmp(temp, FIRST_EXTERNAL_ARRAY_ELEMENTS_KIND); |
__ j(less, &fail, Label::kNear); |
__ cmp(temp, LAST_EXTERNAL_ARRAY_ELEMENTS_KIND); |
@@ -2439,15 +2441,17 @@ void LCodeGen::DoLoadKeyedFastDoubleElement( |
LLoadKeyedFastDoubleElement* instr) { |
XMMRegister result = ToDoubleRegister(instr->result()); |
- int offset = FixedDoubleArray::kHeaderSize - kHeapObjectTag + |
- sizeof(kHoleNanLower32); |
- Operand hole_check_operand = BuildFastArrayOperand( |
- instr->elements(), instr->key(), |
- FAST_DOUBLE_ELEMENTS, |
- offset, |
- instr->additional_index()); |
- __ cmp(hole_check_operand, Immediate(kHoleNanUpper32)); |
- DeoptimizeIf(equal, instr->environment()); |
+ if (instr->hydrogen()->RequiresHoleCheck()) { |
+ int offset = FixedDoubleArray::kHeaderSize - kHeapObjectTag + |
+ sizeof(kHoleNanLower32); |
+ Operand hole_check_operand = BuildFastArrayOperand( |
+ instr->elements(), instr->key(), |
+ FAST_DOUBLE_ELEMENTS, |
+ offset, |
+ instr->additional_index()); |
+ __ cmp(hole_check_operand, Immediate(kHoleNanUpper32)); |
+ DeoptimizeIf(equal, instr->environment()); |
+ } |
Operand double_load_operand = BuildFastArrayOperand( |
instr->elements(), |
@@ -2528,9 +2532,12 @@ void LCodeGen::DoLoadKeyedSpecializedArrayElement( |
break; |
case EXTERNAL_FLOAT_ELEMENTS: |
case EXTERNAL_DOUBLE_ELEMENTS: |
- case FAST_SMI_ONLY_ELEMENTS: |
+ case FAST_SMI_ELEMENTS: |
case FAST_ELEMENTS: |
case FAST_DOUBLE_ELEMENTS: |
+ case FAST_HOLEY_SMI_ELEMENTS: |
+ case FAST_HOLEY_ELEMENTS: |
+ case FAST_HOLEY_DOUBLE_ELEMENTS: |
case DICTIONARY_ELEMENTS: |
case NON_STRICT_ARGUMENTS_ELEMENTS: |
UNREACHABLE(); |
@@ -3456,9 +3463,12 @@ void LCodeGen::DoStoreKeyedSpecializedArrayElement( |
break; |
case EXTERNAL_FLOAT_ELEMENTS: |
case EXTERNAL_DOUBLE_ELEMENTS: |
- case FAST_SMI_ONLY_ELEMENTS: |
+ case FAST_SMI_ELEMENTS: |
case FAST_ELEMENTS: |
case FAST_DOUBLE_ELEMENTS: |
+ case FAST_HOLEY_SMI_ELEMENTS: |
+ case FAST_HOLEY_ELEMENTS: |
+ case FAST_HOLEY_DOUBLE_ELEMENTS: |
case DICTIONARY_ELEMENTS: |
case NON_STRICT_ARGUMENTS_ELEMENTS: |
UNREACHABLE(); |
@@ -3550,22 +3560,23 @@ void LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) { |
__ cmp(FieldOperand(object_reg, HeapObject::kMapOffset), from_map); |
__ j(not_equal, ¬_applicable); |
__ mov(new_map_reg, to_map); |
- if (from_kind == FAST_SMI_ONLY_ELEMENTS && to_kind == FAST_ELEMENTS) { |
+ if (IsSimpleMapChangeTransition(from_kind, to_kind)) { |
Register object_reg = ToRegister(instr->object()); |
__ mov(FieldOperand(object_reg, HeapObject::kMapOffset), new_map_reg); |
// Write barrier. |
ASSERT_NE(instr->temp_reg(), NULL); |
__ RecordWriteField(object_reg, HeapObject::kMapOffset, new_map_reg, |
ToRegister(instr->temp_reg()), kDontSaveFPRegs); |
- } else if (from_kind == FAST_SMI_ONLY_ELEMENTS && |
- to_kind == FAST_DOUBLE_ELEMENTS) { |
+ } else if (IsFastSmiElementsKind(from_kind) && |
+ IsFastDoubleElementsKind(to_kind)) { |
Register fixed_object_reg = ToRegister(instr->temp_reg()); |
ASSERT(fixed_object_reg.is(edx)); |
ASSERT(new_map_reg.is(ebx)); |
__ mov(fixed_object_reg, object_reg); |
CallCode(isolate()->builtins()->TransitionElementsSmiToDouble(), |
RelocInfo::CODE_TARGET, instr); |
- } else if (from_kind == FAST_DOUBLE_ELEMENTS && to_kind == FAST_ELEMENTS) { |
+ } else if (IsFastDoubleElementsKind(from_kind) && |
+ IsFastObjectElementsKind(to_kind)) { |
Register fixed_object_reg = ToRegister(instr->temp_reg()); |
ASSERT(fixed_object_reg.is(edx)); |
ASSERT(new_map_reg.is(ebx)); |
@@ -4425,8 +4436,9 @@ void LCodeGen::DoArrayLiteral(LArrayLiteral* instr) { |
// Deopt if the array literal boilerplate ElementsKind is of a type different |
// than the expected one. The check isn't necessary if the boilerplate has |
- // already been converted to FAST_ELEMENTS. |
- if (boilerplate_elements_kind != FAST_ELEMENTS) { |
+ // already been converted to TERMINAL_FAST_ELEMENTS_KIND. |
+ if (CanTransitionToMoreGeneralFastElementsKind( |
+ boilerplate_elements_kind, true)) { |
__ LoadHeapObject(eax, instr->hydrogen()->boilerplate_object()); |
__ mov(ebx, FieldOperand(eax, HeapObject::kMapOffset)); |
// Load the map's "bit field 2". We only need the first byte, |
@@ -4588,8 +4600,9 @@ void LCodeGen::DoFastLiteral(LFastLiteral* instr) { |
// Deopt if the literal boilerplate ElementsKind is of a type different than |
// the expected one. The check isn't necessary if the boilerplate has already |
- // been converted to FAST_ELEMENTS. |
- if (boilerplate_elements_kind != FAST_ELEMENTS) { |
+ // already been converted to TERMINAL_FAST_ELEMENTS_KIND. |
+ if (CanTransitionToMoreGeneralFastElementsKind( |
+ boilerplate_elements_kind, true)) { |
__ LoadHeapObject(ebx, instr->hydrogen()->boilerplate()); |
__ mov(ecx, FieldOperand(ebx, HeapObject::kMapOffset)); |
// Load the map's "bit field 2". We only need the first byte, |