Reviewers: Hannes Payer,
Description:
Remove deprecated --flush-code-incrementally flag.
[email protected]
Please review this at https://codereview.chromium.org/1218003003/
Base URL: https://chromium.googlesource.com/v8/v8.git@local_contrib-14703009
Affected files (+6, -25 lines):
M src/flag-definitions.h
M src/heap/heap.cc
M src/heap/mark-compact.cc
M test/cctest/test-heap.cc
Index: src/flag-definitions.h
diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index
2f45087e0b6388c7316524b6aa539322d9611ae1..ee0bffc717b1d294909f2b4f299a2b7e4dca8a7b
100644
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -615,10 +615,7 @@ DEFINE_BOOL(weak_embedded_maps_in_optimized_code, true,
"make maps embedded in optimized code weak")
DEFINE_BOOL(weak_embedded_objects_in_optimized_code, true,
"make objects embedded in optimized code weak")
-DEFINE_BOOL(flush_code, true,
- "flush code that we expect not to use again (during full gc)")
-DEFINE_BOOL(flush_code_incrementally, true,
- "flush code that we expect not to use again (incrementally)")
+DEFINE_BOOL(flush_code, true, "flush code that we expect not to use again")
DEFINE_BOOL(trace_code_flushing, false, "trace code flushing progress")
DEFINE_BOOL(age_code, true,
"track un-executed functions to age code and flush only "
Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index
6039bdb4c6ba64d3d47b7bd9f527c1e9e460bae2..435b1b22aa85ecee49b7a4d0924006870670adda
100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -433,7 +433,7 @@ void Heap::GarbageCollectionPrologue() {
gc_count_++;
unflattened_strings_length_ = 0;
- if (FLAG_flush_code && FLAG_flush_code_incrementally) {
+ if (FLAG_flush_code) {
mark_compact_collector()->EnableCodeFlushing(true);
}
Index: src/heap/mark-compact.cc
diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc
index
bfc3e8f2ffe3353e19640c06a9571fcfa3849aa0..e4f2040c6f1d3362b9b127b2e2f01002d12e97c3
100644
--- a/src/heap/mark-compact.cc
+++ b/src/heap/mark-compact.cc
@@ -1572,11 +1572,6 @@ void
MarkCompactCollector::PrepareThreadForCodeFlushing(Isolate* isolate,
void MarkCompactCollector::PrepareForCodeFlushing() {
- // Enable code flushing for non-incremental cycles.
- if (FLAG_flush_code && !FLAG_flush_code_incrementally) {
- EnableCodeFlushing(!was_marked_incrementally_);
- }
-
// If code flushing is disabled, there is no need to prepare for it.
if (!is_code_flushing_enabled()) return;
@@ -2308,11 +2303,6 @@ void MarkCompactCollector::AfterMarking() {
// Flush code from collected candidates.
if (is_code_flushing_enabled()) {
code_flusher_->ProcessCandidates();
- // If incremental marker does not support code flushing, we need to
- // disable it before incremental marking steps for next cycle.
- if (FLAG_flush_code && !FLAG_flush_code_incrementally) {
- EnableCodeFlushing(false);
- }
}
if (FLAG_track_gc_object_stats) {
Index: test/cctest/test-heap.cc
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
index
64235409299198926d3453ee12f77e6216eced26..3f60f60af20825f287524ff6bb38784ea1b5d3b9
100644
--- a/test/cctest/test-heap.cc
+++ b/test/cctest/test-heap.cc
@@ -1194,7 +1194,7 @@ TEST(TestCodeFlushingPreAged) {
TEST(TestCodeFlushingIncremental) {
// If we do not flush code this test is invalid.
- if (!FLAG_flush_code || !FLAG_flush_code_incrementally) return;
+ if (!FLAG_flush_code) return;
i::FLAG_allow_natives_syntax = true;
i::FLAG_optimize_for_size = false;
CcTest::InitializeVM();
@@ -1263,7 +1263,7 @@ TEST(TestCodeFlushingIncremental) {
TEST(TestCodeFlushingIncrementalScavenge) {
// If we do not flush code this test is invalid.
- if (!FLAG_flush_code || !FLAG_flush_code_incrementally) return;
+ if (!FLAG_flush_code) return;
i::FLAG_allow_natives_syntax = true;
i::FLAG_optimize_for_size = false;
CcTest::InitializeVM();
@@ -1332,7 +1332,7 @@ TEST(TestCodeFlushingIncrementalScavenge) {
TEST(TestCodeFlushingIncrementalAbort) {
// If we do not flush code this test is invalid.
- if (!FLAG_flush_code || !FLAG_flush_code_incrementally) return;
+ if (!FLAG_flush_code) return;
i::FLAG_allow_natives_syntax = true;
i::FLAG_optimize_for_size = false;
CcTest::InitializeVM();
@@ -1400,8 +1400,7 @@ TEST(TestCodeFlushingIncrementalAbort) {
TEST(CompilationCacheCachingBehavior) {
// If we do not flush code, or have the compilation cache turned off,
this
// test is invalid.
- if (!FLAG_flush_code || !FLAG_flush_code_incrementally ||
- !FLAG_compilation_cache) {
+ if (!FLAG_flush_code || !FLAG_compilation_cache) {
return;
}
CcTest::InitializeVM();
@@ -4009,7 +4008,6 @@ UNINITIALIZED_TEST(ReleaseStackTraceData) {
TEST(Regress159140) {
i::FLAG_allow_natives_syntax = true;
- i::FLAG_flush_code_incrementally = true;
CcTest::InitializeVM();
Isolate* isolate = CcTest::i_isolate();
Heap* heap = isolate->heap();
@@ -4071,7 +4069,6 @@ TEST(Regress159140) {
TEST(Regress165495) {
i::FLAG_allow_natives_syntax = true;
- i::FLAG_flush_code_incrementally = true;
CcTest::InitializeVM();
Isolate* isolate = CcTest::i_isolate();
Heap* heap = isolate->heap();
@@ -4119,7 +4116,6 @@ TEST(Regress165495) {
TEST(Regress169209) {
i::FLAG_stress_compaction = false;
i::FLAG_allow_natives_syntax = true;
- i::FLAG_flush_code_incrementally = true;
CcTest::InitializeVM();
Isolate* isolate = CcTest::i_isolate();
@@ -4268,7 +4264,6 @@ TEST(Regress168801) {
i::FLAG_always_compact = true;
i::FLAG_cache_optimized_code = false;
i::FLAG_allow_natives_syntax = true;
- i::FLAG_flush_code_incrementally = true;
CcTest::InitializeVM();
Isolate* isolate = CcTest::i_isolate();
Heap* heap = isolate->heap();
@@ -4325,7 +4320,6 @@ TEST(Regress173458) {
i::FLAG_always_compact = true;
i::FLAG_cache_optimized_code = false;
i::FLAG_allow_natives_syntax = true;
- i::FLAG_flush_code_incrementally = true;
CcTest::InitializeVM();
Isolate* isolate = CcTest::i_isolate();
Heap* heap = isolate->heap();
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
