Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Revert "Enable lazy-async-stacks by-default in all modes (2) (#19270)" #20165

Merged
merged 1 commit into from
Jul 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions runtime/dart_vm.cc
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ static const char* kDartLanguageArgs[] = {
// clang-format off
"--enable_mirrors=false",
"--background_compilation",
"--no-causal_async_stacks",
"--lazy_async_stacks",
"--causal_async_stacks",
// clang-format on
};

Expand Down
9 changes: 3 additions & 6 deletions shell/common/shell_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -285,19 +285,16 @@ TEST_F(ShellTest, AllowedDartVMFlag) {
const std::vector<fml::CommandLine::Option> options = {
#if !FLUTTER_RELEASE
fml::CommandLine::Option("dart-flags",
"--lazy_async_stacks,--no-causal_async_stacks,"
"--max_profile_depth 1,--random_seed 42")
#endif
};
fml::CommandLine command_line("", options, std::vector<std::string>());
flutter::Settings settings = flutter::SettingsFromCommandLine(command_line);

#if !FLUTTER_RELEASE
EXPECT_EQ(settings.dart_flags.size(), 4u);
EXPECT_EQ(settings.dart_flags[0], "--lazy_async_stacks");
EXPECT_EQ(settings.dart_flags[1], "--no-causal_async_stacks");
EXPECT_EQ(settings.dart_flags[2], "--max_profile_depth 1");
EXPECT_EQ(settings.dart_flags[3], "--random_seed 42");
EXPECT_EQ(settings.dart_flags.size(), 2u);
EXPECT_EQ(settings.dart_flags[0], "--max_profile_depth 1");
EXPECT_EQ(settings.dart_flags[1], "--random_seed 42");
#else
EXPECT_EQ(settings.dart_flags.size(), 0u);
#endif
Expand Down
3 changes: 2 additions & 1 deletion shell/platform/fuchsia/dart_runner/dart_runner.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ namespace {

const char* kDartVMArgs[] = {
// clang-format off
// TODO(FL-117): Re-enable causal async stack traces when this issue is
// addressed.
"--no_causal_async_stacks",
"--lazy_async_stacks",

#if !defined(FLUTTER_PROFILE)
"--systrace_timeline",
Expand Down
1 change: 0 additions & 1 deletion shell/platform/fuchsia/dart_runner/embedder/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ template("create_aot_snapshot") {

args = [
"--no_causal_async_stacks",
"--lazy_async_stacks",
"--deterministic",
"--snapshot_kind=vm-aot-assembly",
"--assembly=" + rebase_path(snapshot_assembly),
Expand Down
3 changes: 2 additions & 1 deletion shell/platform/fuchsia/dart_runner/kernel/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ template("create_kernel_core_snapshot") {
tool = gen_snapshot_to_use

args = [
# TODO(FL-117): Re-enable causal async stack traces when this issue is
# addressed.
"--no_causal_async_stacks",
"--lazy_async_stacks",
"--use_bytecode_compiler",
"--enable_mirrors=false",
"--deterministic",
Expand Down
1 change: 0 additions & 1 deletion shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ template("aot_snapshot") {

args = [
"--no_causal_async_stacks",
"--lazy_async_stacks",
"--deterministic",
"--snapshot_kind=app-aot-elf",
"--elf=" + rebase_path(snapshot_path),
Expand Down
4 changes: 4 additions & 0 deletions shell/platform/fuchsia/flutter/component.cc
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,10 @@ Application::Application(
settings_.task_observer_remove = std::bind(
&CurrentMessageLoopRemoveAfterTaskObserver, std::placeholders::_1);

// TODO(FL-117): Re-enable causal async stack traces when this issue is
// addressed.
settings_.dart_flags = {"--no_causal_async_stacks"};

// Disable code collection as it interferes with JIT code warmup
// by decreasing usage counters and flushing code which is still useful.
settings_.dart_flags.push_back("--no-collect_code");
Expand Down
3 changes: 2 additions & 1 deletion shell/platform/fuchsia/flutter/kernel/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,9 @@ template("core_snapshot") {
tool = gen_snapshot_to_use

args = [
# TODO(FL-117): Re-enable causal async stack traces when this issue is
# addressed.
"--no_causal_async_stacks",
"--lazy_async_stacks",
"--use_bytecode_compiler",
"--enable_mirrors=false",
"--deterministic",
Expand Down
3 changes: 1 addition & 2 deletions testing/scenario_app/compile_ios_jit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ echo "Compiling JIT Snapshot..."

"$DEVICE_TOOLS/gen_snapshot" --deterministic \
--enable-asserts \
--no-causal_async_stacks \
--lazy_async_stacks \
--causal_async_stacks \
--isolate_snapshot_instructions="$OUTDIR/isolate_snapshot_instr" \
--snapshot_kind=app-jit \
--load_vm_snapshot_data="$DEVICE_TOOLS/../gen/flutter/lib/snapshot/vm_isolate_snapshot.bin" \
Expand Down
3 changes: 1 addition & 2 deletions testing/testing.gni
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ template("dart_snapshot_aot") {
outputs = [ elf_object ]

args = [
"--no-causal_async_stacks",
"--lazy_async_stacks",
"--causal_async_stacks",
"--deterministic",
"--snapshot_kind=app-aot-elf",
"--elf=" + rebase_path(elf_object),
Expand Down