[v8-dev] Fix build with debuggersupport=off. (issue 8073020)

[yangguo]

Reviewers: Jakob,

Message:
Please take a look.
Description:
Fix build with debuggersupport=off.

BUG=v8:899


Please review this at http://codereview.chromium.org/8073020/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files:
  M src/d8-debug.cc
  M src/d8.cc
  M src/flag-definitions.h
  M src/full-codegen.cc


Index: src/d8-debug.cc
diff --git a/src/d8-debug.cc b/src/d8-debug.cc
index  
adefba73227c0a14d3060d00617d33119df361e4..9de87e2df760724311e4e197efe171350355045e  
100644
--- a/src/d8-debug.cc
+++ b/src/d8-debug.cc
@@ -25,6 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+#ifdef ENABLE_DEBUGGER_SUPPORT

 #include "d8.h"
 #include "d8-debug.h"
@@ -367,3 +368,5 @@ void KeyboardThread::Run() {


 }  // namespace v8
+
+#endif  // ENABLE_DEBUGGER_SUPPORT
Index: src/d8.cc
diff --git a/src/d8.cc b/src/d8.cc
index  
ead17a2649bc0605ffc6ae3dbf17cd5de5a58ed7..c58deb0b5ce841c522d2351df51c2b3d0f3800b7  
100644
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -146,11 +146,11 @@ bool Shell::ExecuteString(Handle<String> source,
                           Handle<Value> name,
                           bool print_result,
                           bool report_exceptions) {
-#ifndef V8_SHARED
+#if !defined(V8_SHARED) && defined(ENABLE_DEBUGGER_SUPPORT)
   bool FLAG_debugger = i::FLAG_debugger;
 #else
   bool FLAG_debugger = false;
-#endif  // V8_SHARED
+#endif  // !V8_SHARED && ENABLE_DEBUGGER_SUPPORT
   HandleScope handle_scope;
   TryCatch try_catch;
   options.script_executed = true;
@@ -594,6 +594,7 @@ void Shell::InstallUtilityScript() {
   Context::Scope utility_scope(utility_context_);

 #ifdef ENABLE_DEBUGGER_SUPPORT
+  if (i::FLAG_debugger) printf("JavaScript debugger enabled\n");
   // Install the debugger object in the utility scope
   i::Debug* debug = i::Isolate::Current()->debug();
   debug->Load();
@@ -900,9 +901,6 @@ void Shell::RunShell() {
 #ifndef V8_SHARED
   console = LineEditor::Get();
   printf("V8 version %s [console: %s]\n", V8::GetVersion(),  
console->name());
-  if (i::FLAG_debugger) {
-    printf("JavaScript debugger enabled\n");
-  }
   console->Open();
   while (true) {
     i::SmartArrayPointer<char> input = console->Prompt(Shell::kPrompt);
@@ -1256,13 +1254,13 @@ int Shell::RunMain(int argc, char* argv[]) {
     if (options.last_run) {
       // Keep using the same context in the interactive shell.
       evaluation_context_ = context;
-#ifndef V8_SHARED
+#if !defined(V8_SHARED) && defined(ENABLE_DEBUGGER_SUPPORT)
       // If the interactive debugger is enabled make sure to activate
       // it before running the files passed on the command line.
       if (i::FLAG_debugger) {
         InstallUtilityScript();
       }
-#endif  // V8_SHARED
+#endif  // !V8_SHARED && ENABLE_DEBUGGER_SUPPORT
     }
     {
       Context::Scope cscope(context);
@@ -1339,11 +1337,11 @@ int Shell::Main(int argc, char* argv[]) {
   if (( options.interactive_shell
       || !options.script_executed )
       && !options.test_shell ) {
-#ifndef V8_SHARED
+#if !defined(V8_SHARED) && defined(ENABLE_DEBUGGER_SUPPORT)
     if (!i::FLAG_debugger) {
       InstallUtilityScript();
     }
-#endif  // V8_SHARED
+#endif  // !V8_SHARED && ENABLE_DEBUGGER_SUPPORT
     RunShell();
   }

Index: src/flag-definitions.h
diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index  
639846ca5d7019cd6adc05c6a0aaef12cae3ad8b..23b3a24f453c16b4cc22cf084cb02c8e5afa36b5  
100644
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -360,11 +360,15 @@  
DEFINE_string(testing_serialization_file, "/tmp/serdes",

 DEFINE_bool(help, false, "Print usage message, including flags, on  
console")
 DEFINE_bool(dump_counters, false, "Dump counters on exit")
+
+#ifdef ENABLE_DEBUGGER_SUPPORT
 DEFINE_bool(debugger, false, "Enable JavaScript debugger")
 DEFINE_bool(remote_debugger, false, "Connect JavaScript debugger to the "
                                     "debugger agent in another process")
 DEFINE_bool(debugger_agent, false, "Enable debugger agent")
 DEFINE_int(debugger_port, 5858, "Port to use for remote debugging")
+#endif  // ENABLE_DEBUGGER_SUPPORT
+
 DEFINE_string(map_counters, "", "Map counters to a file")
 DEFINE_args(js_arguments, JSArguments(),
             "Pass all remaining arguments to the script. Alias for  
\"--\".")
Index: src/full-codegen.cc
diff --git a/src/full-codegen.cc b/src/full-codegen.cc
index  
4101b29f507719905fa648fb50f58b2144e08b82..e822588e209b23b5bb775b6b9c2f2267030a31d1  
100644
--- a/src/full-codegen.cc
+++ b/src/full-codegen.cc
@@ -286,8 +286,10 @@ bool FullCodeGenerator::MakeCode(CompilationInfo*  
info) {
   code->set_optimizable(info->IsOptimizable());
   cgen.PopulateDeoptimizationData(code);
   code->set_has_deoptimization_support(info->HasDeoptimizationSupport());
+#ifdef ENABLE_DEBUGGER_SUPPORT
   code->set_has_debug_break_slots(
       info->isolate()->debugger()->IsDebuggerActive());
+#endif  // ENABLE_DEBUGGER_SUPPORT
   code->set_allow_osr_at_loop_nesting_level(0);
   code->set_stack_check_table_offset(table_offset);
   CodeGenerator::PrintCode(code, info);


--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev