| Index: src/ia32/code-stubs-ia32.cc
|
| diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc
|
| index f06cc5b700f95afd82c97cab5b60a2c1660a6e33..8d63cfdd59d41343bd00cb5f7c453d3a2518d956 100644
|
| --- a/src/ia32/code-stubs-ia32.cc
|
| +++ b/src/ia32/code-stubs-ia32.cc
|
| @@ -5886,21 +5886,6 @@ void ArrayConstructorStubBase::GenerateStubsAheadOfTime(Isolate* isolate) {
|
| }
|
|
|
|
|
| -void InternalArrayConstructorStubBase::GenerateStubsAheadOfTime(
|
| - Isolate* isolate) {
|
| - ElementsKind kinds[2] = { FAST_ELEMENTS, FAST_HOLEY_ELEMENTS };
|
| - for (int i = 0; i < 2; i++) {
|
| - // For internal arrays we only need a few things
|
| - InternalArrayNoArgumentConstructorStub stubh1(kinds[i]);
|
| - stubh1.GetCode(isolate)->set_is_pregenerated(true);
|
| - InternalArraySingleArgumentConstructorStub stubh2(kinds[i]);
|
| - stubh2.GetCode(isolate)->set_is_pregenerated(true);
|
| - InternalArrayNArgumentsConstructorStub stubh3(kinds[i]);
|
| - stubh3.GetCode(isolate)->set_is_pregenerated(true);
|
| - }
|
| -}
|
| -
|
| -
|
| void ArrayConstructorStub::GenerateDispatchToArrayStub(
|
| MacroAssembler* masm,
|
| AllocationSiteOverrideMode mode) {
|
| @@ -6058,14 +6043,22 @@ void InternalArrayConstructorStub::Generate(MacroAssembler* masm) {
|
| __ cmp(ecx, Immediate(FAST_ELEMENTS));
|
| __ j(equal, &done);
|
| __ cmp(ecx, Immediate(FAST_HOLEY_ELEMENTS));
|
| + __ j(equal, &done);
|
| + __ cmp(ecx, Immediate(FAST_DOUBLE_ELEMENTS));
|
| __ Assert(equal,
|
| kInvalidElementsKindForInternalArrayOrInternalPackedArray);
|
| __ bind(&done);
|
| }
|
|
|
| - Label fast_elements_case;
|
| + Label fast_elements_case, fast_holey_elements_case;
|
| __ cmp(ecx, Immediate(FAST_ELEMENTS));
|
| __ j(equal, &fast_elements_case);
|
| + __ cmp(ecx, Immediate(FAST_HOLEY_ELEMENTS));
|
| + __ j(equal, &fast_holey_elements_case);
|
| +
|
| + GenerateCase(masm, FAST_DOUBLE_ELEMENTS);
|
| +
|
| + __ bind(&fast_holey_elements_case);
|
| GenerateCase(masm, FAST_HOLEY_ELEMENTS);
|
|
|
| __ bind(&fast_elements_case);
|
|
|