| Index: src/x64/code-stubs-x64.cc
|
| diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
|
| index 8712e27e76aaedc8097105191b5a731f88e6953c..e749185e8ea7a643926fc80d66d40f5008b40c1d 100644
|
| --- a/src/x64/code-stubs-x64.cc
|
| +++ b/src/x64/code-stubs-x64.cc
|
| @@ -5688,21 +5688,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) {
|
| @@ -5863,14 +5848,22 @@ void InternalArrayConstructorStub::Generate(MacroAssembler* masm) {
|
| __ cmpl(rcx, Immediate(FAST_ELEMENTS));
|
| __ j(equal, &done);
|
| __ cmpl(rcx, Immediate(FAST_HOLEY_ELEMENTS));
|
| + __ j(equal, &done);
|
| + __ cmpl(rcx, Immediate(FAST_DOUBLE_ELEMENTS));
|
| __ Assert(equal,
|
| kInvalidElementsKindForInternalArrayOrInternalPackedArray);
|
| __ bind(&done);
|
| }
|
|
|
| - Label fast_elements_case;
|
| + Label fast_elements_case, fast_holey_elements_case;
|
| __ cmpl(rcx, Immediate(FAST_ELEMENTS));
|
| __ j(equal, &fast_elements_case);
|
| + __ cmpl(rcx, 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);
|
|
|