Index: src/d8.cc |
diff --git a/src/d8.cc b/src/d8.cc |
index b04fa71bdf5e7025851b6af6dcda38eb6ed6d22c..8bd5bb72fe063717d3355faf579c19637a34b70f 100644 |
--- a/src/d8.cc |
+++ b/src/d8.cc |
@@ -1345,7 +1345,7 @@ int Shell::RunMain(Isolate* isolate, int argc, char* argv[]) { |
{ |
HandleScope scope(isolate); |
Local<Context> context = CreateEvaluationContext(isolate); |
- if (options.last_run && options.interactive_shell) { |
+ if (options.last_run && options.use_interactive_shell()) { |
// Keep using the same context in the interactive shell. |
evaluation_context_.Reset(isolate, context); |
#ifndef V8_SHARED |
@@ -1524,8 +1524,7 @@ int Shell::Main(int argc, char* argv[]) { |
// 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 ) { |
+ if (options.use_interactive_shell()) { |
#ifndef V8_SHARED |
if (!i::FLAG_debugger) { |
InstallUtilityScript(isolate); |