Fix some correctness issues with the store buffer shown up by...

src/store-buffer.h

 // Copyright 2010 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 46 matching lines @@
   // to attempt to remove any dupes.  During the first part of a scavenge we
   // are using the store buffer to access the old spaces and at the same time
   // we are rebuilding the store buffer using this function.  There is, however
   // no issue of overwriting the buffer we are iterating over, because this
   // stage of the scavenge can only reduce the number of addresses in the store
   // buffer (some objects are promoted so pointers to them do not need to be in
   // the store buffer).  The later parts of the scavenge process the promotion
   // queue and they can overflow this buffer, which we must check for.
   static inline void EnterDirectlyIntoStoreBuffer(Address addr);
 
-  enum RebuildStoreBufferMode {
-    kRebuildStoreBufferWhileIterating,
-    kPreserveStoreBufferWhileIterating};
-
   // Iterates over all pointers that go from old space to new space.  It will
   // delete the store buffer as it starts so the callback should reenter
   // surviving old-to-new pointers into the store buffer to rebuild it.
   static void IteratePointersToNewSpace(ObjectSlotCallback callback);
 
   static const int kStoreBufferOverflowBit = 1 << 16;
   static const int kStoreBufferSize = kStoreBufferOverflowBit;
   static const int kStoreBufferLength = kStoreBufferSize / sizeof(Address);
   static const int kOldStoreBufferLength = kStoreBufferLength * 16;
   static const int kHashMapLengthLog2 = 12;
   static const int kHashMapLength = 1 << kHashMapLengthLog2;
 
   static void Compact();
   static void GCPrologue(GCType type, GCCallbackFlags flags);
   static void GCEpilogue(GCType type, GCCallbackFlags flags);
 
   static Object*** Start() { return reinterpret_cast<Object***>(old_start_); }
   static Object*** Top() { return reinterpret_cast<Object***>(old_top_); }
 
   enum StoreBufferMode {
     kStoreBufferFunctional,
     kStoreBufferDisabled,
     kStoreBufferBeingRebuilt
   };
 
   static StoreBufferMode store_buffer_mode() { return store_buffer_mode_; }
+  static inline void set_store_buffer_mode(StoreBufferMode mode);
   static bool old_buffer_is_sorted() { return old_buffer_is_sorted_; }
 
   // Goes through the store buffer removing pointers to things that have
   // been promoted.  Rebuilds the store buffer completely if it overflowed.
   static void SortUniq();
   static void Verify();
 
 #ifdef DEBUG
   static void Clean();
   // Slow, for asserts only.
@@ skipping 59 matching lines @@
     StoreBuffer::may_move_store_buffer_entries_ = stored_state_;
   }
 
  private:
   bool stored_state_;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_WRITE_BARRIER_H_