Skip to content

Commit 3903b5b

Browse files
zandersocommit-bot@chromium.org
authored andcommitted
[vm] Fix passing --enable_interpreter in tests.
Also changes an Assert back to a test in Exceptions::JumpToFrame Change-Id: I3088a342caaf7a1560ba6225ecbdb8bb363ac5fb Reviewed-on: https://dart-review.googlesource.com/74009 Reviewed-by: Alexander Markov <[email protected]> Reviewed-by: Régis Crelier <[email protected]> Commit-Queue: Zach Anderson <[email protected]>
1 parent cd9a422 commit 3903b5b

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

runtime/vm/exceptions.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,7 @@ void Exceptions::JumpToFrame(Thread* thread,
470470
// are callee frames of the C++ frame handling the exception.
471471
if (FLAG_enable_interpreter) {
472472
Interpreter* interpreter = thread->isolate()->interpreter();
473-
ASSERT(interpreter != NULL);
474-
if (interpreter->HasFrame(frame_pointer)) {
473+
if ((interpreter != NULL) && interpreter->HasFrame(frame_pointer)) {
475474
interpreter->JumpToFrame(program_counter, stack_pointer, frame_pointer,
476475
thread);
477476
}

tools/testing/dart/compiler_configuration.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,9 @@ class VMKernelCompilerConfiguration extends CompilerConfiguration
244244
} else if (_configuration.hotReloadRollback) {
245245
args.add('--hot-reload-rollback-test-mode');
246246
}
247-
247+
if (_configuration.useKernelBytecode) {
248+
args.add('--enable_interpreter');
249+
}
248250
return args
249251
..addAll(vmOptions)
250252
..addAll(sharedOptions)

tools/testing/dart/runtime_configuration.dart

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,11 @@ class StandaloneDartRuntimeConfiguration extends DartVmRuntimeConfiguration {
217217
throw "Dart VM cannot run files of type '$type'.";
218218
}
219219

220-
List<String> args = arguments;
221-
if (suite.configuration.compiler == Compiler.dartkb) {
222-
args.add('--enable_interpreter');
223-
}
224-
225220
String executable = suite.dartVmBinaryFileName;
226221
if (type == 'application/kernel-ir-fully-linked') {
227222
executable = suite.dartVmExecutableFileName;
228223
}
229-
return [Command.vm(executable, args, environmentOverrides)];
224+
return [Command.vm(executable, arguments, environmentOverrides)];
230225
}
231226
}
232227

0 commit comments

Comments
 (0)