From 3d0d21176412992337495857eb61ccd846161b5f Mon Sep 17 00:00:00 2001 From: "mstarzinger@chromium.org" Date: Mon, 15 Oct 2012 09:25:30 +0000 Subject: [PATCH] Ensure code flushing is disabled in incremental marking. This fixes some test failures since r12714 which shared the code for code flushing between full and incremental marking and is only a quick fix until we can enable incremental code flushing. R=jkummerow@chromium.org BUG=v8:1609 Review URL: https://codereview.chromium.org/11137014 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12723 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mark-compact.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mark-compact.cc b/src/mark-compact.cc index f8fd0cd..37fec4e 100644 --- a/src/mark-compact.cc +++ b/src/mark-compact.cc @@ -2003,6 +2003,9 @@ void MarkCompactCollector::AfterMarking() { // Flush code from collected candidates. if (is_code_flushing_enabled()) { code_flusher_->ProcessCandidates(); + // TODO(1609) Currently incremental marker does not support code flushing, + // we need to disable it before incremental marking steps for next cycle. + EnableCodeFlushing(false); } if (!FLAG_watch_ic_patching) { -- 2.7.4