[dart] Pass --no_use_field_guards consistently
Change-Id: I18c7080f33ce85ed46d021f1a4800bbb39ff2b6a
diff --git a/runtime/dart_runner/dart_runner.cc b/runtime/dart_runner/dart_runner.cc
index 89feb9e..a546c14 100644
--- a/runtime/dart_runner/dart_runner.cc
+++ b/runtime/dart_runner/dart_runner.cc
@@ -47,6 +47,9 @@
// The interpreter is enabled unconditionally. If an app is built for
// debugging (that is, with no bytecode), the VM will fall back on ASTs.
"--enable_interpreter",
+
+ // TODO(FL-208): Remove when field guards work.
+ "--no_use_field_guards",
#endif
#if !defined(NDEBUG) && !defined(DART_PRODUCT)
diff --git a/runtime/dart_runner/kernel/BUILD.gn b/runtime/dart_runner/kernel/BUILD.gn
index f1eddb5..87a0ce6 100644
--- a/runtime/dart_runner/kernel/BUILD.gn
+++ b/runtime/dart_runner/kernel/BUILD.gn
@@ -63,8 +63,9 @@
}
args = [
- # TODO(zra): remove this when the interpreter supports field guards.
+ # TODO(FL-208): remove this when the interpreter supports field guards.
"--no_use_field_guards",
+
# TODO(FL-117): Re-enable causal async stack traces when this issue is
# addressed.
"--no_causal_async_stacks",
diff --git a/runtime/flutter_runner/component.cc b/runtime/flutter_runner/component.cc
index 4108142..8a54333 100644
--- a/runtime/flutter_runner/component.cc
+++ b/runtime/flutter_runner/component.cc
@@ -289,6 +289,9 @@
// debugging (that is, with no bytecode), the VM will fall back on ASTs.
settings_.dart_flags.push_back("--enable_interpreter");
+ // TODO(FL-208): Remove when field guards work.
+ settings_.dart_flags.push_back("--no_use_field_guards");
+
auto dispatcher = async_get_default_dispatcher();
const std::string component_url = package.resolved_url;
settings_.unhandled_exception_callback =
diff --git a/runtime/flutter_runner/kernel/BUILD.gn b/runtime/flutter_runner/kernel/BUILD.gn
index 85b7cfa..7d5db67 100644
--- a/runtime/flutter_runner/kernel/BUILD.gn
+++ b/runtime/flutter_runner/kernel/BUILD.gn
@@ -88,7 +88,7 @@
script = gen_snapshot
}
args = [
- # TODO(zra): remove this when the interpreter supports field guards.
+ # TODO(FL-208): remove this when the interpreter supports field guards.
"--no_use_field_guards",
# TODO(FL-117): Re-enable causal async stack traces when this issue is
