Revert r4715.

src/x64/stub-cache-x64.cc

Index: src/x64/stub-cache-x64.cc
===================================================================
--- src/x64/stub-cache-x64.cc	(revision 4722)
+++ src/x64/stub-cache-x64.cc	(working copy)
@@ -1148,7 +1148,7 @@
     __ j(not_equal, &miss);
 
     if (argc == 1) {  // Otherwise fall through to call builtin.
-      Label call_builtin, exit, with_write_barrier, attempt_to_grow_elements;
+      Label call_builtin, exit, with_rset_update, attempt_to_grow_elements;
 
       // Get the array's length into rax and calculate new length.
       __ movq(rax, FieldOperand(rdx, JSArray::kLengthOffset));
@@ -1156,7 +1156,8 @@
       __ SmiAddConstant(rax, rax, Smi::FromInt(argc));
 
       // Get the element's length into rcx.
-      __ movq(rcx, FieldOperand(rbx, FixedArray::kLengthOffset));
+      __ movl(rcx, FieldOperand(rbx, FixedArray::kLengthOffset));
+      __ Integer32ToSmi(rcx, rcx);
 
       // Check if we could survive without allocation.
       __ SmiCompare(rax, rcx);
@@ -1175,12 +1176,12 @@
       __ movq(Operand(rdx, 0), rcx);
 
       // Check if value is a smi.
-      __ JumpIfNotSmi(rcx, &with_write_barrier);
+      __ JumpIfNotSmi(rcx, &with_rset_update);
 
       __ bind(&exit);
       __ ret((argc + 1) * kPointerSize);
 
-      __ bind(&with_write_barrier);
+      __ bind(&with_rset_update);
 
       __ InNewSpace(rbx, rcx, equal, &exit);
 
@@ -1228,11 +1229,11 @@
       __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize));
 
       // Increment element's and array's sizes.
-      __ SmiAddConstant(FieldOperand(rbx, FixedArray::kLengthOffset),
-                        Smi::FromInt(kAllocationDelta));
+      __ addl(FieldOperand(rbx, FixedArray::kLengthOffset),
+              Immediate(kAllocationDelta));
       __ movq(FieldOperand(rdx, JSArray::kLengthOffset), rax);
 
-      // Elements are in new space, so write barrier is not required.
+      // Elements are in new space, so no remembered set updates are necessary.
       __ ret((argc + 1) * kPointerSize);
 
       __ bind(&call_builtin);