Combine the incremental-marking write barrier and the remembered-set...

src/ia32/full-codegen-ia32.cc

Index: src/ia32/full-codegen-ia32.cc
===================================================================
--- src/ia32/full-codegen-ia32.cc	(revision 7494)
+++ src/ia32/full-codegen-ia32.cc	(working copy)
@@ -3093,8 +3093,11 @@
   __ InNewSpace(elements, temp, equal, &new_space);
 
   __ mov(object, elements);
-  __ RecordWriteHelper(object, index_1, temp, kDontSaveFPRegs);
-  __ RecordWriteHelper(elements, index_2, temp, kDontSaveFPRegs);
+  // Since we are swapping two objects, the incremental marker is not disturbed,
+  // so we don't call the stub that handles this.  TODO(gc): Optimize by
+  // checking the scan_on_scavenge flag, probably by calling the stub.
+  __ RememberedSetHelper(object, index_1, temp, kDontSaveFPRegs);
+  __ RememberedSetHelper(elements, index_2, temp, kDontSaveFPRegs);
 
   __ bind(&new_space);