Skip to content

V
V8
Commit ee9c7091 authored by petermarshall's avatar petermarshall Committed by Commit bot
Browse files
Options

[builtins] Don't put doubles on the stack in ConstructWithSpread. 

FAST_DOUBLE_ELEMENTS and FAST_HOLEY_DOUBLE_ELEMENTS kinds should both
be handled by the runtime.

Review-Url: https://codereview.chromium.org/2644643011
Cr-Commit-Position: refs/heads/master@{#42561}
parent a1e04ef5
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 22 deletions
src/builtins/arm/builtins-arm.cc
View file @ ee9c7091
...@@ -2789,15 +2789,13 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) { ...@@ -2789,15 +2789,13 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) {
Label no_protector_check; Label no_protector_check;
__ ldr(scratch, FieldMemOperand(spread_map, Map::kBitField2Offset)); __ ldr(scratch, FieldMemOperand(spread_map, Map::kBitField2Offset));
__ DecodeField<Map::ElementsKindBits>(scratch); __ DecodeField<Map::ElementsKindBits>(scratch);
__ cmp(scratch, Operand(LAST_FAST_ELEMENTS_KIND)); __ cmp(scratch, Operand(FAST_HOLEY_ELEMENTS));
__ b(hi, &runtime_call); __ b(hi, &runtime_call);
// For non-FastHoley kinds, we can skip the protector check. // For non-FastHoley kinds, we can skip the protector check.
__ cmp(scratch, Operand(FAST_SMI_ELEMENTS)); __ cmp(scratch, Operand(FAST_SMI_ELEMENTS));
__ b(eq, &no_protector_check); __ b(eq, &no_protector_check);
__ cmp(scratch, Operand(FAST_ELEMENTS)); __ cmp(scratch, Operand(FAST_ELEMENTS));
__ b(eq, &no_protector_check); __ b(eq, &no_protector_check);
__ cmp(scratch, Operand(FAST_DOUBLE_ELEMENTS));
__ b(eq, &no_protector_check);
// Check the ArrayProtector cell. // Check the ArrayProtector cell.
__ LoadRoot(scratch, Heap::kArrayProtectorRootIndex); __ LoadRoot(scratch, Heap::kArrayProtectorRootIndex);
__ ldr(scratch, FieldMemOperand(scratch, PropertyCell::kValueOffset)); __ ldr(scratch, FieldMemOperand(scratch, PropertyCell::kValueOffset));
......
src/builtins/arm64/builtins-arm64.cc
View file @ ee9c7091
...@@ -2875,15 +2875,13 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) { ...@@ -2875,15 +2875,13 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) {
Label no_protector_check; Label no_protector_check;
__ Ldr(scratch, FieldMemOperand(spread_map, Map::kBitField2Offset)); __ Ldr(scratch, FieldMemOperand(spread_map, Map::kBitField2Offset));
__ DecodeField<Map::ElementsKindBits>(scratch); __ DecodeField<Map::ElementsKindBits>(scratch);
__ Cmp(scratch, LAST_FAST_ELEMENTS_KIND); __ Cmp(scratch, FAST_HOLEY_ELEMENTS);
__ B(hi, &runtime_call); __ B(hi, &runtime_call);
// For non-FastHoley kinds, we can skip the protector check. // For non-FastHoley kinds, we can skip the protector check.
__ Cmp(scratch, FAST_SMI_ELEMENTS); __ Cmp(scratch, FAST_SMI_ELEMENTS);
__ B(eq, &no_protector_check); __ B(eq, &no_protector_check);
__ Cmp(scratch, FAST_ELEMENTS); __ Cmp(scratch, FAST_ELEMENTS);
__ B(eq, &no_protector_check); __ B(eq, &no_protector_check);
__ Cmp(scratch, FAST_DOUBLE_ELEMENTS);
__ B(eq, &no_protector_check);
// Check the ArrayProtector cell. // Check the ArrayProtector cell.
__ LoadRoot(scratch, Heap::kArrayProtectorRootIndex); __ LoadRoot(scratch, Heap::kArrayProtectorRootIndex);
__ Ldr(scratch, FieldMemOperand(scratch, PropertyCell::kValueOffset)); __ Ldr(scratch, FieldMemOperand(scratch, PropertyCell::kValueOffset));
......
src/builtins/ia32/builtins-ia32.cc
View file @ ee9c7091
...@@ -2855,15 +2855,13 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) { ...@@ -2855,15 +2855,13 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) {
Label no_protector_check; Label no_protector_check;
__ mov(scratch, FieldOperand(spread_map, Map::kBitField2Offset)); __ mov(scratch, FieldOperand(spread_map, Map::kBitField2Offset));
__ DecodeField<Map::ElementsKindBits>(scratch); __ DecodeField<Map::ElementsKindBits>(scratch);
__ cmp(scratch, Immediate(LAST_FAST_ELEMENTS_KIND)); __ cmp(scratch, Immediate(FAST_HOLEY_ELEMENTS));
__ j(above, &runtime_call); __ j(above, &runtime_call);
// For non-FastHoley kinds, we can skip the protector check. // For non-FastHoley kinds, we can skip the protector check.
__ cmp(scratch, Immediate(FAST_SMI_ELEMENTS)); __ cmp(scratch, Immediate(FAST_SMI_ELEMENTS));
__ j(equal, &no_protector_check); __ j(equal, &no_protector_check);
__ cmp(scratch, Immediate(FAST_ELEMENTS)); __ cmp(scratch, Immediate(FAST_ELEMENTS));
__ j(equal, &no_protector_check); __ j(equal, &no_protector_check);
__ cmp(scratch, Immediate(FAST_DOUBLE_ELEMENTS));
__ j(equal, &no_protector_check);
// Check the ArrayProtector cell. // Check the ArrayProtector cell.
__ LoadRoot(scratch, Heap::kArrayProtectorRootIndex); __ LoadRoot(scratch, Heap::kArrayProtectorRootIndex);
__ cmp(FieldOperand(scratch, PropertyCell::kValueOffset), __ cmp(FieldOperand(scratch, PropertyCell::kValueOffset),
......
src/builtins/mips/builtins-mips.cc
View file @ ee9c7091
...@@ -2866,11 +2866,10 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) { ...@@ -2866,11 +2866,10 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) {
Label no_protector_check; Label no_protector_check;
__ lbu(scratch, FieldMemOperand(spread_map, Map::kBitField2Offset)); __ lbu(scratch, FieldMemOperand(spread_map, Map::kBitField2Offset));
__ DecodeField<Map::ElementsKindBits>(scratch); __ DecodeField<Map::ElementsKindBits>(scratch);
__ Branch(&runtime_call, hi, scratch, Operand(LAST_FAST_ELEMENTS_KIND)); __ Branch(&runtime_call, hi, scratch, Operand(FAST_HOLEY_ELEMENTS));
// For non-FastHoley kinds, we can skip the protector check. // For non-FastHoley kinds, we can skip the protector check.
__ Branch(&no_protector_check, eq, scratch, Operand(FAST_SMI_ELEMENTS)); __ Branch(&no_protector_check, eq, scratch, Operand(FAST_SMI_ELEMENTS));
__ Branch(&no_protector_check, eq, scratch, Operand(FAST_ELEMENTS)); __ Branch(&no_protector_check, eq, scratch, Operand(FAST_ELEMENTS));
__ Branch(&no_protector_check, eq, scratch, Operand(FAST_DOUBLE_ELEMENTS));
// Check the ArrayProtector cell. // Check the ArrayProtector cell.
__ LoadRoot(scratch, Heap::kArrayProtectorRootIndex); __ LoadRoot(scratch, Heap::kArrayProtectorRootIndex);
__ lw(scratch, FieldMemOperand(scratch, PropertyCell::kValueOffset)); __ lw(scratch, FieldMemOperand(scratch, PropertyCell::kValueOffset));
......
src/builtins/mips64/builtins-mips64.cc
View file @ ee9c7091
...@@ -2889,11 +2889,10 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) { ...@@ -2889,11 +2889,10 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) {
Label no_protector_check; Label no_protector_check;
__ lbu(scratch, FieldMemOperand(spread_map, Map::kBitField2Offset)); __ lbu(scratch, FieldMemOperand(spread_map, Map::kBitField2Offset));
__ DecodeField<Map::ElementsKindBits>(scratch); __ DecodeField<Map::ElementsKindBits>(scratch);
__ Branch(&runtime_call, hi, scratch, Operand(LAST_FAST_ELEMENTS_KIND)); __ Branch(&runtime_call, hi, scratch, Operand(FAST_HOLEY_ELEMENTS));
// For non-FastHoley kinds, we can skip the protector check. // For non-FastHoley kinds, we can skip the protector check.
__ Branch(&no_protector_check, eq, scratch, Operand(FAST_SMI_ELEMENTS)); __ Branch(&no_protector_check, eq, scratch, Operand(FAST_SMI_ELEMENTS));
__ Branch(&no_protector_check, eq, scratch, Operand(FAST_ELEMENTS)); __ Branch(&no_protector_check, eq, scratch, Operand(FAST_ELEMENTS));
__ Branch(&no_protector_check, eq, scratch, Operand(FAST_DOUBLE_ELEMENTS));
// Check the ArrayProtector cell. // Check the ArrayProtector cell.
__ LoadRoot(scratch, Heap::kArrayProtectorRootIndex); __ LoadRoot(scratch, Heap::kArrayProtectorRootIndex);
__ lw(scratch, FieldMemOperand(scratch, PropertyCell::kValueOffset)); __ lw(scratch, FieldMemOperand(scratch, PropertyCell::kValueOffset));
......
src/builtins/ppc/builtins-ppc.cc
View file @ ee9c7091
...@@ -2865,15 +2865,13 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) { ...@@ -2865,15 +2865,13 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) {
Label no_protector_check; Label no_protector_check;
__ LoadP(scratch, FieldMemOperand(spread_map, Map::kBitField2Offset)); __ LoadP(scratch, FieldMemOperand(spread_map, Map::kBitField2Offset));
__ DecodeField<Map::ElementsKindBits>(scratch); __ DecodeField<Map::ElementsKindBits>(scratch);
__ cmpi(scratch, Operand(LAST_FAST_ELEMENTS_KIND)); __ cmpi(scratch, Operand(FAST_HOLEY_ELEMENTS));
__ bgt(&runtime_call); __ bgt(&runtime_call);
// For non-FastHoley kinds, we can skip the protector check. // For non-FastHoley kinds, we can skip the protector check.
__ cmpi(scratch, Operand(FAST_SMI_ELEMENTS)); __ cmpi(scratch, Operand(FAST_SMI_ELEMENTS));
__ beq(&no_protector_check); __ beq(&no_protector_check);
__ cmpi(scratch, Operand(FAST_ELEMENTS)); __ cmpi(scratch, Operand(FAST_ELEMENTS));
__ beq(&no_protector_check); __ beq(&no_protector_check);
__ cmpi(scratch, Operand(FAST_DOUBLE_ELEMENTS));
__ beq(&no_protector_check);
// Check the ArrayProtector cell. // Check the ArrayProtector cell.
__ LoadRoot(scratch, Heap::kArrayProtectorRootIndex); __ LoadRoot(scratch, Heap::kArrayProtectorRootIndex);
__ LoadP(scratch, FieldMemOperand(scratch, PropertyCell::kValueOffset)); __ LoadP(scratch, FieldMemOperand(scratch, PropertyCell::kValueOffset));
......
src/builtins/s390/builtins-s390.cc
View file @ ee9c7091
...@@ -2878,15 +2878,13 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) { ...@@ -2878,15 +2878,13 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) {
Label no_protector_check; Label no_protector_check;
__ LoadP(scratch, FieldMemOperand(spread_map, Map::kBitField2Offset)); __ LoadP(scratch, FieldMemOperand(spread_map, Map::kBitField2Offset));
__ DecodeField<Map::ElementsKindBits>(scratch); __ DecodeField<Map::ElementsKindBits>(scratch);
__ CmpP(scratch, Operand(LAST_FAST_ELEMENTS_KIND)); __ CmpP(scratch, Operand(FAST_HOLEY_ELEMENTS));
__ bgt(&runtime_call); __ bgt(&runtime_call);
// For non-FastHoley kinds, we can skip the protector check. // For non-FastHoley kinds, we can skip the protector check.
__ CmpP(scratch, Operand(FAST_SMI_ELEMENTS)); __ CmpP(scratch, Operand(FAST_SMI_ELEMENTS));
__ beq(&no_protector_check); __ beq(&no_protector_check);
__ CmpP(scratch, Operand(FAST_ELEMENTS)); __ CmpP(scratch, Operand(FAST_ELEMENTS));
__ beq(&no_protector_check); __ beq(&no_protector_check);
__ CmpP(scratch, Operand(FAST_DOUBLE_ELEMENTS));
__ beq(&no_protector_check);
// Check the ArrayProtector cell. // Check the ArrayProtector cell.
__ LoadRoot(scratch, Heap::kArrayProtectorRootIndex); __ LoadRoot(scratch, Heap::kArrayProtectorRootIndex);
__ LoadP(scratch, FieldMemOperand(scratch, PropertyCell::kValueOffset)); __ LoadP(scratch, FieldMemOperand(scratch, PropertyCell::kValueOffset));
......
src/builtins/x64/builtins-x64.cc
View file @ ee9c7091
...@@ -2931,15 +2931,13 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) { ...@@ -2931,15 +2931,13 @@ void Builtins::Generate_ConstructWithSpread(MacroAssembler* masm) {
Label no_protector_check; Label no_protector_check;
__ movzxbp(rcx, FieldOperand(r15, Map::kBitField2Offset)); __ movzxbp(rcx, FieldOperand(r15, Map::kBitField2Offset));
__ DecodeField<Map::ElementsKindBits>(rcx); __ DecodeField<Map::ElementsKindBits>(rcx);
__ cmpp(rcx, Immediate(LAST_FAST_ELEMENTS_KIND)); __ cmpp(rcx, Immediate(FAST_HOLEY_ELEMENTS));
__ j(above, &runtime_call); __ j(above, &runtime_call);
// For non-FastHoley kinds, we can skip the protector check. // For non-FastHoley kinds, we can skip the protector check.
__ cmpp(rcx, Immediate(FAST_SMI_ELEMENTS)); __ cmpp(rcx, Immediate(FAST_SMI_ELEMENTS));
__ j(equal, &no_protector_check); __ j(equal, &no_protector_check);
__ cmpp(rcx, Immediate(FAST_ELEMENTS)); __ cmpp(rcx, Immediate(FAST_ELEMENTS));
__ j(equal, &no_protector_check); __ j(equal, &no_protector_check);
__ cmpp(rcx, Immediate(FAST_DOUBLE_ELEMENTS));
__ j(equal, &no_protector_check);
// Check the ArrayProtector cell. // Check the ArrayProtector cell.
__ LoadRoot(rcx, Heap::kArrayProtectorRootIndex); __ LoadRoot(rcx, Heap::kArrayProtectorRootIndex);
__ Cmp(FieldOperand(rcx, PropertyCell::kValueOffset), __ Cmp(FieldOperand(rcx, PropertyCell::kValueOffset),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment