Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1486)

Unified Diff: src/serialize.cc

Issue 5999010: Fix numerous bugs introduced by reducing Page::kMaxHeapObjectSize. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/gc
Patch Set: Created 9 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/spaces.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/serialize.cc
diff --git a/src/serialize.cc b/src/serialize.cc
index 00a601ffd95ff15f0131d56e555fca6cd4b0144c..cc1cbdf8b2474d5c8b28efcbd5b01bf322a508ac 100644
--- a/src/serialize.cc
+++ b/src/serialize.cc
@@ -577,8 +577,7 @@ Deserializer::Deserializer(SnapshotByteSource* source) : source_(source) {
Address Deserializer::Allocate(int space_index, Space* space, int size) {
Address address;
if (!SpaceIsLarge(space_index)) {
- ASSERT(!SpaceIsPaged(space_index) ||
- size <= Page::kPageSize - Page::kObjectStartOffset);
+ ASSERT(!SpaceIsPaged(space_index) || size <= Page::kMaxHeapObjectSize);
MaybeObject* maybe_new_allocation;
if (space_index == NEW_SPACE) {
maybe_new_allocation =
@@ -593,7 +592,7 @@ Address Deserializer::Allocate(int space_index, Space* space, int size) {
high_water_[space_index] = address + size;
} else {
ASSERT(SpaceIsLarge(space_index));
- ASSERT(size > Page::kPageSize - Page::kObjectStartOffset);
+ ASSERT(size > Page::kMaxHeapObjectSize);
LargeObjectSpace* lo_space = reinterpret_cast<LargeObjectSpace*>(space);
Object* new_allocation;
if (space_index == kLargeData) {
« no previous file with comments | « no previous file | src/spaces.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698