Index: src/arm/full-codegen-arm.cc |
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc |
index 3c8df292c4dee1f1142f6ca2e2fb1df236e7c755..2a5887a953c8124ae817f6c464dcc4d95392f0b8 100644 |
--- a/src/arm/full-codegen-arm.cc |
+++ b/src/arm/full-codegen-arm.cc |
@@ -1701,7 +1701,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
ASSERT_EQ(2, constant_elements->length()); |
ElementsKind constant_elements_kind = |
static_cast<ElementsKind>(Smi::cast(constant_elements->get(0))->value()); |
- bool has_fast_elements = constant_elements_kind == FAST_ELEMENTS; |
+ bool has_fast_elements = IsFastObjectElementsKind(constant_elements_kind); |
Handle<FixedArrayBase> constant_elements_values( |
FixedArrayBase::cast(constant_elements->get(1))); |
@@ -1722,8 +1722,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
} else if (length > FastCloneShallowArrayStub::kMaximumClonedLength) { |
__ CallRuntime(Runtime::kCreateArrayLiteralShallow, 3); |
} else { |
- ASSERT(constant_elements_kind == FAST_ELEMENTS || |
- constant_elements_kind == FAST_SMI_ONLY_ELEMENTS || |
+ ASSERT(IsFastSmiOrObjectElementsKind(constant_elements_kind) || |
FLAG_smi_only_arrays); |
FastCloneShallowArrayStub::Mode mode = has_fast_elements |
? FastCloneShallowArrayStub::CLONE_ELEMENTS |
@@ -1751,7 +1750,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
} |
VisitForAccumulatorValue(subexpr); |
- if (constant_elements_kind == FAST_ELEMENTS) { |
+ if (IsFastObjectElementsKind(constant_elements_kind)) { |
int offset = FixedArray::kHeaderSize + (i * kPointerSize); |
__ ldr(r6, MemOperand(sp)); // Copy of array literal. |
__ ldr(r1, FieldMemOperand(r6, JSObject::kElementsOffset)); |