| Index: src/mips/full-codegen-mips.cc
|
| diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc
|
| index 4ffd0ea01163fee05390fcf6e3e50931eadf086b..781d1f25bbaa6690c50162bb0ee5a4f0eb5ec287 100644
|
| --- a/src/mips/full-codegen-mips.cc
|
| +++ b/src/mips/full-codegen-mips.cc
|
| @@ -1711,7 +1711,8 @@ 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)));
|
|
|
| @@ -1733,8 +1734,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
|
| @@ -1763,7 +1763,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);
|
| __ lw(t2, MemOperand(sp)); // Copy of array literal.
|
| __ lw(a1, FieldMemOperand(t2, JSObject::kElementsOffset));
|
|
|