Revert 3899 because it tanked V8 benchmark suite. We need an

src/store-buffer.h

 // 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 23 matching lines @@
 #include "platform.h"
 #include "v8globals.h"
 
 namespace v8 {
 namespace internal {
 
 class StoreBuffer;
 
 typedef void (*ObjectSlotCallback)(HeapObject** from, HeapObject* to);
 
-typedef void RegionCallback(
-    StoreBuffer* store_buffer,
-    Address start,
-    Address end,
-    ObjectSlotCallback slot_callback);
+typedef void (StoreBuffer::*RegionCallback)(
+    Address start, Address end, ObjectSlotCallback slot_callback);
 
 // Used to implement the write barrier by collecting addresses of pointers
 // between spaces.
 class StoreBuffer {
  public:
   explicit StoreBuffer(Heap* heap);
 
   static void StoreBufferOverflow(Isolate* isolate);
 
   inline Address TopAddress();
@@ skipping 18 matching lines @@
   // exempt from the store buffer and process the promotion queue.  These steps
   // can overflow this buffer.  We check for this and on overflow we call the
   // callback set up with the StoreBufferRebuildScope object.
   inline void EnterDirectlyIntoStoreBuffer(Address addr);
 
   // 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.
   void IteratePointersToNewSpace(ObjectSlotCallback callback);
 
-  static const int kStoreBufferOverflowBit = 1 << 12;
+  static const int kStoreBufferOverflowBit = 1 << 16;
   static const int kStoreBufferSize = kStoreBufferOverflowBit;
   static const int kStoreBufferLength = kStoreBufferSize / sizeof(Address);
   static const int kOldStoreBufferLength = kStoreBufferLength * 64;
   static const int kHashMapLengthLog2 = 12;
   static const int kHashMapLength = 1 << kHashMapLengthLog2;
 
   void Compact();
   static void GCPrologue(GCType type, GCCallbackFlags flags);
   static void GCEpilogue(GCType type, GCCallbackFlags flags);
 
@@ skipping 52 matching lines @@
   VirtualMemory* virtual_memory_;
   uintptr_t* hash_map_1_;
   uintptr_t* hash_map_2_;
 
   void CheckForFullBuffer();
   void Uniq();
   void ZapHashTables();
   bool HashTablesAreZapped();
   void ExemptPopularPages(int prime_sample_step, int threshold);
 
-  enum RecordNewSpacePointers {
-    kDontRecord,
-    kRecord
-  };
-
-  template<RecordNewSpacePointers record>
-  inline void FindPointersToNewSpaceInRegion(Address start,
-                                             Address end,
-                                             ObjectSlotCallback slot_callback);
-
-  // It seems gcc doesn't want to take the address of a templated method,
-  // so we create a new method so that we can give the address.  Also,
-  // pointers to methods tend to have gnarly implementations.
-  static void FindPointersToNewSpaceInRegionRecord(
-      StoreBuffer* store_buffer,
-      Address start,
-      Address end,
-      ObjectSlotCallback slot_callback);
-
-  static void FindPointersToNewSpaceInRegionDontRecord(
-      StoreBuffer* store_buffer,
-      Address start,
-      Address end,
-      ObjectSlotCallback slot_callback);
+  void FindPointersToNewSpaceInRegion(Address start,
+                                      Address end,
+                                      ObjectSlotCallback slot_callback);
 
   // For each region of pointers on a page in use from an old space call
   // visit_pointer_region callback.
   // If either visit_pointer_region or callback can cause an allocation
   // in old space and changes in allocation watermark then
   // can_preallocate_during_iteration should be set to true.
   void IteratePointersOnPage(
       PagedSpace* space,
       Page* page,
       RegionCallback region_callback,
       ObjectSlotCallback slot_callback);
 
   void FindPointersToNewSpaceInMaps(
     Address start,
     Address end,
     ObjectSlotCallback slot_callback);
 
-  static void FindPointersToNewSpaceInMapsRegion(
-    StoreBuffer* store_buffer,
+  void FindPointersToNewSpaceInMapsRegion(
     Address start,
     Address end,
     ObjectSlotCallback slot_callback);
 
   void FindPointersToNewSpaceOnPage(
     PagedSpace* space,
     Page* page,
     RegionCallback region_callback,
     ObjectSlotCallback slot_callback);
 
@@ skipping 50 matching lines @@
   }
 
  private:
   StoreBuffer* store_buffer_;
   bool stored_state_;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_STORE_BUFFER_H_