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

src/heap.cc

 // 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 4107 matching lines @@
     // newly promoted objects and fix the pointers before the promotion
     // queue gets to them.
     ASSERT(StoreBuffer::store_buffer_mode() !=
                StoreBuffer::kStoreBufferFunctional ||
            !Heap::InToSpace(object));
     if (Heap::InFromSpace(object)) {
       callback(reinterpret_cast<HeapObject**>(slot), HeapObject::cast(object));
       if (Heap::InNewSpace(*slot)) {
         ASSERT(Heap::InToSpace(*slot));
         ASSERT((*slot)->IsHeapObject());
-        StoreBuffer::EnterDirectlyIntoStoreBuffer(
-            reinterpret_cast<Address>(slot));
+        ASSERT(StoreBuffer::CellIsInStoreBuffer(
+            reinterpret_cast<Address>(slot)));
       }
     }
     slot_address += kPointerSize;
   }
 }
 
 
 #ifdef DEBUG
 static void CheckStoreBuffer(Object** current,
                              Object** limit,
@@ skipping 84 matching lines @@
     // Page can contain garbage pointers there.
     Address end;
 
     if (watermark_state == WATERMARK_SHOULD_BE_VALID ||
         page->IsWatermarkValid()) {
       end = page->AllocationWatermark();
     } else {
       end = page->CachedAllocationWatermark();
     }
 
-
     Address map_aligned_current = page->ObjectAreaStart();
 
     ASSERT(map_aligned_current == MapStartAlign(map_aligned_current));
     ASSERT(end == MapEndAlign(end));
 
     Object*** store_buffer_position = StoreBuffer::Start();
     Object*** store_buffer_top = StoreBuffer::Top();
 
     for ( ; map_aligned_current < end; map_aligned_current += Map::kSize) {
       ASSERT(!Heap::InNewSpace(Memory::Object_at(map_aligned_current)));
@@ skipping 1265 matching lines @@
 void ExternalStringTable::TearDown() {
   new_space_strings_.Free();
   old_space_strings_.Free();
 }
 
 
 List<Object*> ExternalStringTable::new_space_strings_;
 List<Object*> ExternalStringTable::old_space_strings_;
 
 } }  // namespace v8::internal