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

src/incremental-marking.cc

Index: src/incremental-marking.cc
===================================================================
--- src/incremental-marking.cc	(revision 7503)
+++ src/incremental-marking.cc	(working copy)
@@ -169,10 +169,10 @@
       uint32_t key = NumberToUint32(k);
 
       if (CodeStub::MajorKeyFromKey(key) ==
-          CodeStub::IncrementalMarkingRecordWrite) {
+          CodeStub::RecordWrite) {
         Object* e = stubs->ValueAt(i);
         if (e->IsCode()) {
-          IncrementalMarkingRecordWriteStub::Patch(Code::cast(e), enable);
+          RecordWriteStub::Patch(Code::cast(e), enable);
         }
       }
     }