From 6dee868e03fc62fc83204ac2565685c3e46d12e6 Mon Sep 17 00:00:00 2001 From: "vegorov@chromium.org" Date: Mon, 26 Sep 2011 11:46:16 +0000 Subject: [PATCH] Enable compaction, disable code-compaction. Enable array-join test again. R=erik.corry@gmail.com Review URL: http://codereview.chromium.org/8043022 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9425 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/flag-definitions.h | 4 ++-- src/mark-compact.cc | 2 +- test/mjsunit/mjsunit.status | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/flag-definitions.h b/src/flag-definitions.h index 654c32271b..6c39f57170 100644 --- a/src/flag-definitions.h +++ b/src/flag-definitions.h @@ -287,9 +287,9 @@ DEFINE_bool(lazy_sweeping, true, "Use lazy sweeping for old pointer and data spaces") DEFINE_bool(cleanup_caches_in_maps_at_gc, true, "Flush code caches in maps during mark compact cycle.") -DEFINE_bool(never_compact, true, +DEFINE_bool(never_compact, false, "Never perform compaction on full GC - testing only") -DEFINE_bool(compact_code_space, true, "Compact code space") +DEFINE_bool(compact_code_space, false, "Compact code space") DEFINE_bool(cleanup_code_caches_at_gc, true, "Flush inline caches prior to mark compact collection and " "flush code caches in maps during mark compact cycle.") diff --git a/src/mark-compact.cc b/src/mark-compact.cc index 4526d12205..b90ecf0698 100644 --- a/src/mark-compact.cc +++ b/src/mark-compact.cc @@ -485,7 +485,7 @@ void MarkCompactCollector::Prepare(GCTracer* tracer) { #endif // TODO(1726) Revert this into an assertion when compaction is enabled. - if (FLAG_never_compact) FLAG_always_compact = false; + ASSERT(!FLAG_never_compact || !FLAG_always_compact); if (collect_maps_) CreateBackPointers(); #ifdef ENABLE_GDB_JIT_INTERFACE diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status index 966fe0a7e7..d2511b25db 100644 --- a/test/mjsunit/mjsunit.status +++ b/test/mjsunit/mjsunit.status @@ -35,9 +35,6 @@ bugs: FAIL regress/regress-1119: FAIL ############################################################################## -# NewGC: http://code.google.com/p/v8/issues/detail?id=1701 -array-join: SKIP - # NewGC: BUG(1719) slow to collect arrays over several contexts. regress/regress-524: SKIP