Patch RecordWriteStub after adding it to the stub cache not during generation.

src/incremental-marking.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 287 matching lines @@
   // TODO(gc) consider setting this to some low level so that some
   // debug tests run with incremental marking and some without.
   static const intptr_t kActivationThreshold = 0;
 #endif
 
   return FLAG_incremental_marking &&
       heap_->PromotedSpaceSize() > kActivationThreshold;
 }
 
 
+void IncrementalMarking::ActivateGeneratedStub(Code* stub) {
+  ASSERT(RecordWriteStub::GetMode(stub) ==
+             RecordWriteStub::STORE_BUFFER_ONLY);

[Lasse Reichstein, 2011/07/12 06:44:16]

Indent to '(' or four chars from start of statement, not four chars from '('.

[Vyacheslav Egorov (Chromium), 2011/07/12 11:17:11]

Done.

+
+  if (!IsMarking()) {
+    // Initially stub is generated in STORE_BUFFER_ONLY mode thus
+    // we don't need to do anything if incremental marking is
+    // not active.
+  } else if (IsCompacting()) {
+    RecordWriteStub::Patch(stub, RecordWriteStub::INCREMENTAL_COMPACTION);
+  } else {
+    RecordWriteStub::Patch(stub, RecordWriteStub::INCREMENTAL);
+  }
+}
+
+
 static void PatchIncrementalMarkingRecordWriteStubs(
     Heap* heap, RecordWriteStub::Mode mode) {
   NumberDictionary* stubs = heap->code_stubs();
 
   int capacity = stubs->Capacity();
   for (int i = 0; i < capacity; i++) {
     Object* k = stubs->KeyAt(i);
     if (stubs->IsKey(k)) {
       uint32_t key = NumberToUint32(k);
 
@@ skipping 284 matching lines @@
   if (FLAG_trace_incremental_marking || FLAG_trace_gc) {
     double end = OS::TimeCurrentMillis();
     double delta = (end - start);
     steps_took_ += delta;
     steps_took_since_last_gc_ += delta;
   }
 }
 
 
 } }  // namespace v8::internal