Merge (7265, 7271] from bleeding_edge to experimental/gc branch....

src/store-buffer-inl.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 16 matching lines @@
 
 #ifndef V8_STORE_BUFFER_INL_H_
 #define V8_STORE_BUFFER_INL_H_
 
 #include "store-buffer.h"
 
 namespace v8 {
 namespace internal {
 
 Address StoreBuffer::TopAddress() {
-  return reinterpret_cast<Address>(Heap::store_buffer_top_address());
+  return reinterpret_cast<Address>(heap_->store_buffer_top_address());
 }
 
 
 void StoreBuffer::Mark(Address addr) {
-  ASSERT(!Heap::cell_space()->Contains(addr));
-  ASSERT(!Heap::code_space()->Contains(addr));
-  Address* top = reinterpret_cast<Address*>(Heap::store_buffer_top());
+  ASSERT(!heap_->cell_space()->Contains(addr));
+  ASSERT(!heap_->code_space()->Contains(addr));
+  Address* top = reinterpret_cast<Address*>(heap_->store_buffer_top());
   *top++ = addr;
-  Heap::public_set_store_buffer_top(top);
+  heap_->public_set_store_buffer_top(top);
   if ((reinterpret_cast<uintptr_t>(top) & kStoreBufferOverflowBit) != 0) {
     ASSERT(top == limit_);
     Compact();
   } else {
     ASSERT(top < limit_);
   }
 }
 
 
 void StoreBuffer::EnterDirectlyIntoStoreBuffer(Address addr) {
   if (store_buffer_rebuilding_enabled_) {
-    ASSERT(!Heap::cell_space()->Contains(addr));
-    ASSERT(!Heap::code_space()->Contains(addr));
-    ASSERT(!Heap::old_data_space()->Contains(addr));
-    ASSERT(!Heap::new_space()->Contains(addr));
+    ASSERT(!heap_->cell_space()->Contains(addr));
+    ASSERT(!heap_->code_space()->Contains(addr));
+    ASSERT(!heap_->old_data_space()->Contains(addr));
+    ASSERT(!heap_->new_space()->Contains(addr));
     Address* top = old_top_;
     *top++ = addr;
     old_top_ = top;
     old_buffer_is_sorted_ = false;
     old_buffer_is_filtered_ = false;
     if (top >= old_limit_) {
       ASSERT(callback_ != NULL);
-      (*callback_)(MemoryChunk::FromAnyPointerAddress(addr),
+      (*callback_)(heap_,
+                   MemoryChunk::FromAnyPointerAddress(addr),
                    kStoreBufferFullEvent);
     }
   }
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_STORE_BUFFER_INL_H_