Index: src/x64/stub-cache-x64.cc |
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc |
index 25361b367f2ff7022100c3afe98cc528eabea8ec..ac7d33159d08b4ec4c82c6d498de6b7a13ab2d5d 100644 |
--- a/src/x64/stub-cache-x64.cc |
+++ b/src/x64/stub-cache-x64.cc |
@@ -1115,7 +1115,7 @@ Object* CallStubCompiler::CompileArrayPushCall(Object* object, |
__ j(not_equal, &miss); |
if (argc == 1) { // Otherwise fall through to call builtin. |
- Label call_builtin, exit, with_rset_update, attempt_to_grow_elements; |
+ Label call_builtin, exit, with_write_barrier, attempt_to_grow_elements; |
// Get the array's length into rax and calculate new length. |
__ movq(rax, FieldOperand(rdx, JSArray::kLengthOffset)); |
@@ -1123,8 +1123,7 @@ Object* CallStubCompiler::CompileArrayPushCall(Object* object, |
__ SmiAddConstant(rax, rax, Smi::FromInt(argc)); |
// Get the element's length into rcx. |
- __ movl(rcx, FieldOperand(rbx, FixedArray::kLengthOffset)); |
- __ Integer32ToSmi(rcx, rcx); |
+ __ movq(rcx, FieldOperand(rbx, FixedArray::kLengthOffset)); |
// Check if we could survive without allocation. |
__ SmiCompare(rax, rcx); |
@@ -1143,12 +1142,12 @@ Object* CallStubCompiler::CompileArrayPushCall(Object* object, |
__ movq(Operand(rdx, 0), rcx); |
// Check if value is a smi. |
- __ JumpIfNotSmi(rcx, &with_rset_update); |
+ __ JumpIfNotSmi(rcx, &with_write_barrier); |
__ bind(&exit); |
__ ret((argc + 1) * kPointerSize); |
- __ bind(&with_rset_update); |
+ __ bind(&with_write_barrier); |
__ InNewSpace(rbx, rcx, equal, &exit); |
@@ -1196,11 +1195,11 @@ Object* CallStubCompiler::CompileArrayPushCall(Object* object, |
__ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
// Increment element's and array's sizes. |
- __ addl(FieldOperand(rbx, FixedArray::kLengthOffset), |
- Immediate(kAllocationDelta)); |
+ __ SmiAddConstant(FieldOperand(rbx, FixedArray::kLengthOffset), |
+ Smi::FromInt(kAllocationDelta)); |
__ movq(FieldOperand(rdx, JSArray::kLengthOffset), rax); |
- // Elements are in new space, so no remembered set updates are necessary. |
+ // Elements are in new space, so write barrier is not required. |
__ ret((argc + 1) * kPointerSize); |
__ bind(&call_builtin); |