Skip to content

Commit f7c7b41

Browse files
authored
Revert "Enable lazy-async-stacks by-default in all modes (Take 3) (flutter#20895)" (flutter#21043)
This reverts commit 575a519.
1 parent 61062fd commit f7c7b41

File tree

10 files changed

+16
-17
lines changed

10 files changed

+16
-17
lines changed

runtime/dart_vm.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ static const char* kDartLanguageArgs[] = {
5959
// clang-format off
6060
"--enable_mirrors=false",
6161
"--background_compilation",
62-
"--no-causal_async_stacks",
63-
"--lazy_async_stacks",
62+
"--causal_async_stacks",
6463
// clang-format on
6564
};
6665

shell/common/shell_unittests.cc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -312,19 +312,16 @@ TEST_F(ShellTest, AllowedDartVMFlag) {
312312
const std::vector<fml::CommandLine::Option> options = {
313313
#if !FLUTTER_RELEASE
314314
fml::CommandLine::Option("dart-flags",
315-
"--lazy_async_stacks,--no-causal_async_stacks,"
316315
"--max_profile_depth 1,--random_seed 42")
317316
#endif
318317
};
319318
fml::CommandLine command_line("", options, std::vector<std::string>());
320319
flutter::Settings settings = flutter::SettingsFromCommandLine(command_line);
321320

322321
#if !FLUTTER_RELEASE
323-
EXPECT_EQ(settings.dart_flags.size(), 4u);
324-
EXPECT_EQ(settings.dart_flags[0], "--lazy_async_stacks");
325-
EXPECT_EQ(settings.dart_flags[1], "--no-causal_async_stacks");
326-
EXPECT_EQ(settings.dart_flags[2], "--max_profile_depth 1");
327-
EXPECT_EQ(settings.dart_flags[3], "--random_seed 42");
322+
EXPECT_EQ(settings.dart_flags.size(), 2u);
323+
EXPECT_EQ(settings.dart_flags[0], "--max_profile_depth 1");
324+
EXPECT_EQ(settings.dart_flags[1], "--random_seed 42");
328325
#else
329326
EXPECT_EQ(settings.dart_flags.size(), 0u);
330327
#endif

shell/platform/fuchsia/dart_runner/dart_runner.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ namespace {
3535

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

4142
"--systrace_timeline",
4243
"--timeline_streams=Compiler,Dart,Debugger,Embedder,GC,Isolate,VM",

shell/platform/fuchsia/dart_runner/embedder/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ template("create_aot_snapshot") {
4747

4848
args = [
4949
"--no_causal_async_stacks",
50-
"--lazy_async_stacks",
5150
"--deterministic",
5251
"--snapshot_kind=vm-aot-assembly",
5352
"--assembly=" + rebase_path(snapshot_assembly),

shell/platform/fuchsia/dart_runner/kernel/BUILD.gn

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,9 @@ template("create_kernel_core_snapshot") {
7272
tool = gen_snapshot_to_use
7373

7474
args = [
75+
# TODO(FL-117): Re-enable causal async stack traces when this issue is
76+
# addressed.
7577
"--no_causal_async_stacks",
76-
"--lazy_async_stacks",
7778
"--use_bytecode_compiler",
7879
"--enable_mirrors=false",
7980
"--deterministic",

shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ template("aot_snapshot") {
5858

5959
args = [
6060
"--no_causal_async_stacks",
61-
"--lazy_async_stacks",
6261
"--deterministic",
6362
"--snapshot_kind=app-aot-elf",
6463
"--elf=" + rebase_path(snapshot_path),

shell/platform/fuchsia/flutter/component.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,10 @@ Application::Application(
401401
settings_.task_observer_remove = std::bind(
402402
&CurrentMessageLoopRemoveAfterTaskObserver, std::placeholders::_1);
403403

404+
// TODO(FL-117): Re-enable causal async stack traces when this issue is
405+
// addressed.
406+
settings_.dart_flags = {"--no_causal_async_stacks"};
407+
404408
// Disable code collection as it interferes with JIT code warmup
405409
// by decreasing usage counters and flushing code which is still useful.
406410
settings_.dart_flags.push_back("--no-collect_code");

shell/platform/fuchsia/flutter/kernel/BUILD.gn

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ template("core_snapshot") {
7676
tool = gen_snapshot_to_use
7777

7878
args = [
79+
# TODO(FL-117): Re-enable causal async stack traces when this issue is
80+
# addressed.
7981
"--no_causal_async_stacks",
80-
"--lazy_async_stacks",
8182
"--use_bytecode_compiler",
8283
"--enable_mirrors=false",
8384
"--deterministic",

testing/scenario_app/compile_ios_jit.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ echo "Compiling JIT Snapshot..."
7474

7575
"$DEVICE_TOOLS/gen_snapshot" --deterministic \
7676
--enable-asserts \
77-
--no-causal_async_stacks \
78-
--lazy_async_stacks \
77+
--causal_async_stacks \
7978
--isolate_snapshot_instructions="$OUTDIR/isolate_snapshot_instr" \
8079
--snapshot_kind=app-jit \
8180
--load_vm_snapshot_data="$DEVICE_TOOLS/../gen/flutter/lib/snapshot/vm_isolate_snapshot.bin" \

testing/testing.gni

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ template("dart_snapshot_aot") {
128128
outputs = [ elf_object ]
129129

130130
args = [
131-
"--no-causal_async_stacks",
132-
"--lazy_async_stacks",
131+
"--causal_async_stacks",
133132
"--deterministic",
134133
"--snapshot_kind=app-aot-elf",
135134
"--elf=" + rebase_path(elf_object),

0 commit comments

Comments
 (0)