Reland "Merge cellspace into old pointer space"

src/heap/store-buffer-inl.h

Index: src/heap/store-buffer-inl.h
diff --git a/src/heap/store-buffer-inl.h b/src/heap/store-buffer-inl.h
index 806680e145d43ac066d6d92e59a757d4ff957c0c..30663752895d0dd7a2bd5f02a6defd162e1c654f 100644
--- a/src/heap/store-buffer-inl.h
+++ b/src/heap/store-buffer-inl.h
@@ -16,7 +16,6 @@ Address StoreBuffer::TopAddress() {
 
 
 void StoreBuffer::Mark(Address addr) {
-  DCHECK(!heap_->cell_space()->Contains(addr));
   DCHECK(!heap_->code_space()->Contains(addr));
   Address* top = reinterpret_cast<Address*>(heap_->store_buffer_top());
   *top++ = addr;
@@ -32,8 +31,7 @@ void StoreBuffer::Mark(Address addr) {
 
 void StoreBuffer::EnterDirectlyIntoStoreBuffer(Address addr) {
   if (store_buffer_rebuilding_enabled_) {
-    SLOW_DCHECK(!heap_->cell_space()->Contains(addr) &&
-                !heap_->code_space()->Contains(addr) &&
+    SLOW_DCHECK(!heap_->code_space()->Contains(addr) &&
                 !heap_->new_space()->Contains(addr));
     Address* top = old_top_;
     *top++ = addr;