Fix assert in PagedSpace::SizeOfObject for concurrent sweeping.

src/spaces.cc

 // 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 2458 matching lines @@
   // Mark the old linear allocation area with a free space so it can be
   // skipped when scanning the heap.  This also puts it back in the free list
   // if it is big enough.
   Free(top(), old_linear_size);
 
   SetTop(new_area->address(), new_area->address() + size_in_bytes);
   return true;
 }
 
 
+intptr_t PagedSpace::SizeOfObjects() {
+  ASSERT(!IsLazySweepingComplete() || (unswept_free_bytes_ == 0) ||
+         heap()->mark_compact_collector()->IsConcurrentSweepingInProgress());

[Michael Starzinger, 2013/03/04 15:26:29]

Better use the following assertion ...

ASSERT(heap()->IsSweepingComplete() || (unswept_free_bytes_ == 0));

... and move it back to the header so that it can be inlined.

[Hannes Payer (out of office), 2013/03/04 15:47:41]

Done.

I changed the ASSERT as suggested, but now it is weaker.

+  return Size() - unswept_free_bytes_ - (limit() - top());
+}
+
+
 // After we have booted, we have created a map which represents free space
 // on the heap.  If there was already a free list then the elements on it
 // were created with the wrong FreeSpaceMap (normally NULL), so we need to
 // fix them.
 void PagedSpace::RepairFreeListsAfterBoot() {
   free_list_.RepairLists(heap());
 }
 
 
 // You have to call this last, since the implementation from PagedSpace
@@ skipping 633 matching lines @@
     object->ShortPrint();
     PrintF("\n");
   }
   printf(" --------------------------------------\n");
   printf(" Marked: %x, LiveCount: %x\n", mark_size, LiveBytes());
 }
 
 #endif  // DEBUG
 
 } }  // namespace v8::internal