Revision: 9367
Author: sgje...@chromium.org
Date: Wed Sep 21 07:08:56 2011
Log: Turn on d8 interactive debugging before running files passed on
the command line
Merge of r9366 from bleeding edge.
R=yang...@chromium.org
Review URL: http://codereview.chromium.org/7982027
http://code.google.com/p/v8/source/detail?r=9367
Modified:
/branches/3.5/src/d8.cc
/branches/3.5/src/version.cc
=======================================
--- /branches/3.5/src/d8.cc Wed Aug 31 02:03:56 2011
+++ /branches/3.5/src/d8.cc Wed Sep 21 07:08:56 2011
@@ -1205,14 +1205,22 @@
Locker lock;
HandleScope scope;
Persistent<Context> context = CreateEvaluationContext();
+ if (options.last_run) {
+ // Keep using the same context in the interactive shell.
+ evaluation_context_ = context;
+#ifndef V8_SHARED
+ // 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
+ }
{
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();
}
@@ -1281,7 +1289,9 @@
|| !options.script_executed )
&& !options.test_shell ) {
#ifndef V8_SHARED
- InstallUtilityScript();
+ if (!i::FLAG_debugger) {
+ InstallUtilityScript();
+ }
#endif // V8_SHARED
RunShell();
}
=======================================
--- /branches/3.5/src/version.cc Wed Sep 21 01:38:23 2011
+++ /branches/3.5/src/version.cc Wed Sep 21 07:08:56 2011
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 5
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 11
+#define PATCH_LEVEL 12
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
