Disable compilation cache when debugger is active.

Added an option to control whether the compilation cache is enabled. Default value is true.

BUG=343
Review URL: http://codereview.chromium.org/113625

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@2021 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/compilation-cache.cc b/src/compilation-cache.cc
index f9658e8f2571074dd5e3d62c0332c2dd250b3fa4..3ece42dc4d901e2cd6ee7931af1cae473d7b584d 100644 (file)
--- a/src/compilation-cache.cc
+++ b/src/compilation-cache.cc
@@ -44,6 +44,12 @@ enum {
 };
 
 
+// Current enable state of the compilation cache.
+static bool enabled = true;
+static inline bool IsEnabled() {
+  return FLAG_compilation_cache && enabled;
+}
+
 // Keep separate tables for the different entry kinds.
 static Object* tables[NUMBER_OF_TABLE_ENTRIES] = { 0, };
 
@@ -138,6 +144,10 @@ Handle<JSFunction> CompilationCache::LookupScript(Handle<String> source,
                                                   Handle<Object> name,
                                                   int line_offset,
                                                   int column_offset) {
+  if (!IsEnabled()) {
+    return Handle<JSFunction>::null();
+  }
+
   // Use an int for the generation index, so value range propagation
   // in gcc 4.3+ won't assume it can only go up to LAST_ENTRY when in
   // fact it can go up to SCRIPT + NUMBER_OF_SCRIPT_GENERATIONS.
@@ -185,6 +195,10 @@ Handle<JSFunction> CompilationCache::LookupScript(Handle<String> source,
 Handle<JSFunction> CompilationCache::LookupEval(Handle<String> source,
                                                 Handle<Context> context,
                                                 Entry entry) {
+  if (!IsEnabled()) {
+    return Handle<JSFunction>::null();
+  }
+
   ASSERT(entry == EVAL_GLOBAL || entry == EVAL_CONTEXTUAL);
   Handle<JSFunction> result = Lookup(source, context, entry);
   if (result.is_null()) {
@@ -198,6 +212,10 @@ Handle<JSFunction> CompilationCache::LookupEval(Handle<String> source,
 
 Handle<FixedArray> CompilationCache::LookupRegExp(Handle<String> source,
                                                   JSRegExp::Flags flags) {
+  if (!IsEnabled()) {
+    return Handle<FixedArray>::null();
+  }
+
   Handle<FixedArray> result = Lookup(source, flags);
   if (result.is_null()) {
     Counters::compilation_cache_misses.Increment();
@@ -210,6 +228,10 @@ Handle<FixedArray> CompilationCache::LookupRegExp(Handle<String> source,
 
 void CompilationCache::PutScript(Handle<String> source,
                                  Handle<JSFunction> boilerplate) {
+  if (!IsEnabled()) {
+    return;
+  }
+
   HandleScope scope;
   ASSERT(boilerplate->IsBoilerplate());
   Handle<CompilationCacheTable> table = GetTable(SCRIPT);
@@ -221,6 +243,10 @@ void CompilationCache::PutEval(Handle<String> source,
                                Handle<Context> context,
                                Entry entry,
                                Handle<JSFunction> boilerplate) {
+  if (!IsEnabled()) {
+    return;
+  }
+
   HandleScope scope;
   ASSERT(boilerplate->IsBoilerplate());
   Handle<CompilationCacheTable> table = GetTable(entry);
@@ -232,6 +258,10 @@ void CompilationCache::PutEval(Handle<String> source,
 void CompilationCache::PutRegExp(Handle<String> source,
                                  JSRegExp::Flags flags,
                                  Handle<FixedArray> data) {
+  if (!IsEnabled()) {
+    return;
+  }
+
   HandleScope scope;
   Handle<CompilationCacheTable> table = GetTable(REGEXP);
   CALL_HEAP_FUNCTION_VOID(table->PutRegExp(*source, flags, *data));
@@ -261,4 +291,15 @@ void CompilationCache::MarkCompactPrologue() {
 }
 
 
+void CompilationCache::Enable() {
+  enabled = true;
+}
+
+
+void CompilationCache::Disable() {
+  enabled = false;
+  Clear();
+}
+
+
 } }  // namespace v8::internal

diff --git a/src/compilation-cache.h b/src/compilation-cache.h
index b10b5615bc7f0f6e7dea921360798a0f754eb8f1..099b4ad2441a42aa1f8132fbb8f9debc9ceac38b 100644 (file)
--- a/src/compilation-cache.h
+++ b/src/compilation-cache.h
@@ -95,6 +95,11 @@ class CompilationCache {
   // take place. This is used to retire entries from the cache to
   // avoid keeping them alive too long without using them.
   static void MarkCompactPrologue();
+
+  // Enable/disable compilation cache. Used by debugger to disable compilation
+  // cache during debugging to make sure new scripts are always compiled.
+  static void Enable();
+  static void Disable();
 };
 
 

diff --git a/src/debug.cc b/src/debug.cc
index 224b100a7426bb8a77f06bc03af95b73437034de..2f73ef2d625057fe5d6caba5ee8ce7a038941bba 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -31,6 +31,7 @@
 #include "arguments.h"
 #include "bootstrapper.h"
 #include "code-stubs.h"
+#include "compilation-cache.h"
 #include "compiler.h"
 #include "debug.h"
 #include "execution.h"
@@ -2172,6 +2173,13 @@ void Debugger::SetEventListener(Handle<Object> callback,
   if (callback->IsUndefined()) {
     UnloadDebugger();
   }
+
+  // Disable the compilation cache when the debugger is active.
+  if (IsDebuggerActive()) {
+    CompilationCache::Disable();
+  } else {
+    CompilationCache::Enable();
+  }
 }
 
 
@@ -2189,6 +2197,13 @@ void Debugger::SetMessageHandler(v8::Debug::MessageHandler2 handler) {
       ProcessCommand(Vector<const uint16_t>::empty());
     }
   }
+
+  // Disable the compilation cache when the debugger is active.
+  if (IsDebuggerActive()) {
+    CompilationCache::Disable();
+  } else {
+    CompilationCache::Enable();
+  }
 }
 
 

diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index db494532b78973edd2000a4da66232cce556d968..5a4a3c86d1b4bc8f2416ee3c510e0b53d794c307 100644 (file)
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -133,6 +133,9 @@ DEFINE_bool(strict, false, "strict error checking")
 DEFINE_int(min_preparse_length, 1024,
            "Minimum length for automatic enable preparsing")
 
+// compilation-cache.cc
+DEFINE_bool(compilation_cache, true, "enable compilation cache")
+
 // debug.cc
 DEFINE_bool(remote_debugging, false, "enable remote debugging")
 DEFINE_bool(trace_debug_json, false, "trace debugging JSON request/response")

diff --git a/test/cctest/test-debug.cc b/test/cctest/test-debug.cc
index a075113fc21782a6b43af83def840930d898a1b5..edd8506c4362bdf567ba01d275f549f3bbb713d8 100644 (file)
--- a/test/cctest/test-debug.cc
+++ b/test/cctest/test-debug.cc
@@ -1679,11 +1679,6 @@ TEST(ScriptBreakPointIgnoreCount) {
   }
   CHECK_EQ(5, break_point_hit_count);
 
-  // BUG(343): It should not really be necessary to clear the
-  // compilation cache here, but right now the debugger relies on the
-  // script being recompiled, not just fetched from the cache.
-  i::CompilationCache::Clear();
-
   // Reload the script and get f again checking that the ignore survives.
   v8::Script::Compile(script, &origin)->Run();
   f = v8::Local<v8::Function>::Cast(env->Global()->Get(v8::String::New("f")));
@@ -4592,7 +4587,6 @@ TEST(ScriptNameAndData) {
   v8::Handle<v8::Script> script1 = v8::Script::Compile(script, &origin1);
   script1->SetData(v8::String::New("data"));
   script1->Run();
-  v8::Script::Compile(script, &origin1)->Run();
   v8::Local<v8::Function> f;
   f = v8::Local<v8::Function>::Cast(env->Global()->Get(v8::String::New("f")));
 
@@ -4601,6 +4595,15 @@ TEST(ScriptNameAndData) {
   CHECK_EQ("name", last_script_name_hit);
   CHECK_EQ("data", last_script_data_hit);
 
+  // Compile the same script again without setting data. As the compilation
+  // cache is disabled when debugging expect the data to be missing.
+  v8::Script::Compile(script, &origin1)->Run();
+  f = v8::Local<v8::Function>::Cast(env->Global()->Get(v8::String::New("f")));
+  f->Call(env->Global(), 0, NULL);
+  CHECK_EQ(2, break_point_hit_count);
+  CHECK_EQ("name", last_script_name_hit);
+  CHECK_EQ("", last_script_data_hit);  // Undefined results in empty string.
+
   v8::Local<v8::String> data_obj_source = v8::String::New(
     "({ a: 'abc',\n"
     "  b: 123,\n"
@@ -4613,7 +4616,7 @@ TEST(ScriptNameAndData) {
   script2->SetData(data_obj);
   f = v8::Local<v8::Function>::Cast(env->Global()->Get(v8::String::New("f")));
   f->Call(env->Global(), 0, NULL);
-  CHECK_EQ(2, break_point_hit_count);
+  CHECK_EQ(3, break_point_hit_count);
   CHECK_EQ("new name", last_script_name_hit);
   CHECK_EQ("abc 123", last_script_data_hit);
 }