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

Unified Diff: src/spaces.cc

Issue 7860035: Merge bleeding edge up to 9192 into the GC branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/gc
Patch Set: Created 9 years, 3 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 | « src/scopes.cc ('k') | src/string.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/spaces.cc
diff --git a/src/spaces.cc b/src/spaces.cc
index 8e7a947f171e86b7693bc682f71ed702e9644980..3fbfc3d03f5904cf9940fb7cc6b1ce87dd60c727 100644
--- a/src/spaces.cc
+++ b/src/spaces.cc
@@ -821,7 +821,8 @@ void PagedSpace::Verify(ObjectVisitor* visitor) {
ASSERT(object->address() + size <= top);
end_of_previous_object = object->address() + size;
}
- CHECK_LE(black_size, page->LiveBytes());
+ // TODO(1672): Page live bytes are off for some tests.
+ // CHECK_LE(black_size, page->LiveBytes());
}
}
#endif
@@ -2309,10 +2310,7 @@ void LargeObjectSpace::TearDown() {
space, kAllocationActionFree, page->size());
heap()->isolate()->memory_allocator()->Free(page);
}
-
- size_ = 0;
- page_count_ = 0;
- objects_size_ = 0;
+ Setup();
}
@@ -2336,7 +2334,6 @@ MaybeObject* LargeObjectSpace::AllocateRaw(int object_size,
page->set_next_page(first_page_);
first_page_ = page;
-
heap()->incremental_marking()->OldSpaceStep(object_size);
return page->GetObject();
}
« no previous file with comments | « src/scopes.cc ('k') | src/string.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698