Turn on d8 interactive debugging before running files passed on the command line

src/d8.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1235 matching lines @@
     }
   }
   for (int i = 1; i < options.num_isolates; ++i) {
     options.isolate_sources[i].StartExecuteInThread();
   }
 #endif  // V8_SHARED
   {  // NOLINT
     Locker lock;
     HandleScope scope;
     Persistent<Context> context = CreateEvaluationContext();
+    if (options.last_run) {
+      // Keep using the same context in the interactive shell

[Kasper Lund, 2011/09/21 13:14:49]

Terminate comment with .

[Søren Thygesen Gjesse, 2011/09/21 13:42:50]

Done.

+      evaluation_context_ = context;
+      // If the interactive debugger is enabled make sure to activate
+      // it before running the files passed on the command line.
+      if (i::FLAG_debugger && options.last_run) {

[Yang, 2011/09/21 13:09:02]

This breaks the shared library build. Putting this if block into "#ifndef
V8_SHARED [...] #endif" solves this problem.

[Kasper Lund, 2011/09/21 13:16:13]

options.last_run will be true here, right?

[Søren Thygesen Gjesse, 2011/09/21 13:42:50]

Done.

[Søren Thygesen Gjesse, 2011/09/21 13:42:50]

Yes, removed check.

+        InstallUtilityScript();
+      }
+    }
     {
       Context::Scope cscope(context);
       options.isolate_sources[0].Execute();
     }
-    if (options.last_run) {
-      // Keep using the same context in the interactive shell
-      evaluation_context_ = context;
-    } else {
+    if (!options.last_run) {
       context.Dispose();
     }
 
 #ifndef V8_SHARED
     // Start preemption if threads have been created and preemption is enabled.
     if (threads.length() > 0
         && options.use_preemption) {
       Locker::StartPreemption(options.preemption_interval);
     }
 #endif  // V8_SHARED
@@ skipping 51 matching lines @@
   }
 #endif  // !V8_SHARED && ENABLE_DEBUGGER_SUPPORT
 
   // Run interactive shell if explicitly requested or if no script has been
   // executed, but never on --test
 
   if (( options.interactive_shell
       || !options.script_executed )
       && !options.test_shell ) {
 #ifndef V8_SHARED
-    InstallUtilityScript();
+    if (!i::FLAG_debugger) {
+      InstallUtilityScript();
+    }
 #endif  // V8_SHARED
     RunShell();
   }
 
   V8::Dispose();
 
 #ifndef V8_SHARED
   OnExit();
 #endif  // V8_SHARED
 
   return result;
 }
 
 }  // namespace v8
 
 
 #ifndef GOOGLE3
 int main(int argc, char* argv[]) {
   return v8::Shell::Main(argc, argv);
 }
 #endif