Clean up StoreBuffer::EnsureSpace.

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 93 matching lines @@
     old_top_ = reinterpret_cast<Address*>(top);
   }
 
   bool old_buffer_is_sorted() { return old_buffer_is_sorted_; }
   bool old_buffer_is_filtered() { return old_buffer_is_filtered_; }
 
   // Goes through the store buffer removing pointers to things that have
   // been promoted.  Rebuilds the store buffer completely if it overflowed.
   void SortUniq();
 
+  bool SpaceAvailable(intptr_t space_needed);

[Michael Starzinger, 2013/06/11 12:23:48]

This helper function should definitely be private, please move it down (e.g. to
where 'Uniq' is declared).

[Hannes Payer (out of office), 2013/06/12 13:14:25]

Done.

   void EnsureSpace(intptr_t space_needed);

[Michael Starzinger, 2013/06/11 12:23:48]

As discussed offline: It would be great to have only one of the two "Compact"
and "EnsureSpace" entry points. There is only one call-site of EnsureSpace left
after this patch, I like that.

[Hannes Payer (out of office), 2013/06/12 13:14:25]

Done.

   void Verify();
 
   bool PrepareForIteration();
 
 #ifdef DEBUG
   void Clean();
   // Slow, for asserts only.
   bool CellIsInStoreBuffer(Address cell);
 #endif
 
@@ skipping 28 matching lines @@
 
   // Two hash sets used for filtering.
   // If address is in the hash set then it is guaranteed to be in the
   // old part of the store buffer.
   uintptr_t* hash_set_1_;
   uintptr_t* hash_set_2_;
   bool hash_sets_are_empty_;
 
   void ClearFilteringHashSets();
 
-  void CheckForFullBuffer();
   void Uniq();
   void ExemptPopularPages(int prime_sample_step, int threshold);
 
   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
@@ skipping 42 matching lines @@
         stored_state_(store_buffer->store_buffer_rebuilding_enabled_),
         stored_callback_(store_buffer->callback_) {
     store_buffer_->store_buffer_rebuilding_enabled_ = true;
     store_buffer_->callback_ = callback;
     (*callback)(heap, NULL, kStoreBufferStartScanningPagesEvent);
   }
 
   ~StoreBufferRebuildScope() {
     store_buffer_->callback_ = stored_callback_;
     store_buffer_->store_buffer_rebuilding_enabled_ = stored_state_;
-    store_buffer_->CheckForFullBuffer();
   }
 
  private:
   StoreBuffer* store_buffer_;
   bool stored_state_;
   StoreBufferCallback stored_callback_;
 };
 
 
 class DontMoveStoreBufferEntriesScope {
  public:
   explicit DontMoveStoreBufferEntriesScope(StoreBuffer* store_buffer)
       : store_buffer_(store_buffer),
         stored_state_(store_buffer->may_move_store_buffer_entries_) {
     store_buffer_->may_move_store_buffer_entries_ = false;
   }
 
   ~DontMoveStoreBufferEntriesScope() {
     store_buffer_->may_move_store_buffer_entries_ = stored_state_;
   }
 
  private:
   StoreBuffer* store_buffer_;
   bool stored_state_;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_STORE_BUFFER_H_