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

Unified Diff: src/heap/spaces.cc

Issue 1511933002: [cctest] Add tests for aborting compaction of pages (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Addressed comments; fixed typos Created 5 years 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/heap/heap.cc ('k') | test/cctest/cctest.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/heap/spaces.cc
diff --git a/src/heap/spaces.cc b/src/heap/spaces.cc
index 988da6bc99e6440f2b6e873aee94887c70a38620..004c679a9d6be0ad76abeca278b0fa5d93d15bf4 100644
--- a/src/heap/spaces.cc
+++ b/src/heap/spaces.cc
@@ -1168,6 +1168,8 @@ Object* PagedSpace::FindObject(Address addr) {
bool PagedSpace::CanExpand(size_t size) {
+ if (heap()->force_oom()) return false;
Hannes Payer (out of office) 2015/12/10 18:11:54 This check should be done within heap()->CanExpand
Michael Lippautz 2015/12/10 18:20:54 Done. Thanks for clarifying!
+
DCHECK(heap()->mark_compact_collector()->is_compacting() ||
Capacity() <= heap()->MaxOldGenerationSize());
« no previous file with comments | « src/heap/heap.cc ('k') | test/cctest/cctest.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698