Merge 6095:6198 from bleeding_edge to experimental/gc.

src/x64/codegen-x64.cc

Index: src/x64/codegen-x64.cc
===================================================================
--- src/x64/codegen-x64.cc	(revision 6170)
+++ src/x64/codegen-x64.cc	(working copy)
@@ -6826,12 +6826,8 @@
   // (or them and test against Smi mask.)
 
   __ movq(tmp2.reg(), tmp1.reg());
-  RecordWriteStub recordWrite1(tmp2.reg(), index1.reg(), object.reg());
-  __ CallStub(&recordWrite1);
-
-  RecordWriteStub recordWrite2(tmp1.reg(), index2.reg(), object.reg());
-  __ CallStub(&recordWrite2);
-
+  __ RecordWriteHelper(tmp1.reg(), index1.reg(), object.reg());
+  __ RecordWriteHelper(tmp2.reg(), index2.reg(), object.reg());
   __ bind(&done);
 #endif
 
@@ -8837,13 +8833,6 @@
 
 #undef __
 
-void RecordWriteStub::Generate(MacroAssembler* masm) {
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
-  masm->RecordWriteHelper(object_, addr_, scratch_);
-#endif
-  masm->ret(0);
-}
-
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_X64