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

Commit 888a62c

Browse files
authored
Revert "Enable lazy-async-stacks by-default in all modes (#16556)" (#16781)
This reverts commit fdabcad.
1 parent d2e2cc9 commit 888a62c

File tree

11 files changed

+18
-20
lines changed

11 files changed

+18
-20
lines changed

runtime/dart_vm.cc

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

shell/common/shell_unittests.cc

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -281,20 +281,16 @@ TEST_F(ShellTest, BlacklistedDartVMFlag) {
281281
TEST_F(ShellTest, WhitelistedDartVMFlag) {
282282
const std::vector<fml::CommandLine::Option> options = {
283283
fml::CommandLine::Option("dart-flags",
284-
"--lazy_async_stacks,--no-causal_async_stacks,"
285284
"--max_profile_depth 1,--random_seed 42")};
286285
fml::CommandLine command_line("", options, std::vector<std::string>());
287286
flutter::Settings settings = flutter::SettingsFromCommandLine(command_line);
288287

289-
EXPECT_GE(settings.dart_flags.size(), 2u);
290-
EXPECT_EQ(settings.dart_flags[0], "--lazy_async_stacks");
291-
EXPECT_EQ(settings.dart_flags[1], "--no-causal_async_stacks");
292288
#if !FLUTTER_RELEASE
293-
EXPECT_EQ(settings.dart_flags.size(), 4u);
294-
EXPECT_EQ(settings.dart_flags[2], "--max_profile_depth 1");
295-
EXPECT_EQ(settings.dart_flags[3], "--random_seed 42");
296-
#else
297289
EXPECT_EQ(settings.dart_flags.size(), 2u);
290+
EXPECT_EQ(settings.dart_flags[0], "--max_profile_depth 1");
291+
EXPECT_EQ(settings.dart_flags[1], "--random_seed 42");
292+
#else
293+
EXPECT_EQ(settings.dart_flags.size(), 0u);
298294
#endif
299295
}
300296

shell/common/switches.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ struct SwitchDesc {
4141

4242
// clang-format off
4343
static const std::string gDartFlagsWhitelist[] = {
44-
"--lazy_async_stacks",
4544
"--no-causal_async_stacks",
45+
"--lazy_async_stacks",
4646
};
4747
// clang-format on
4848

shell/platform/fuchsia/dart_runner/dart_runner.cc

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

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

4142
#if !defined(FLUTTER_PROFILE)

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

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

5454
args = [
5555
"--no_causal_async_stacks",
56-
"--lazy_async_stacks",
5756
"--deterministic",
5857
"--snapshot_kind=vm-aot-assembly",
5958
"--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
@@ -71,8 +71,9 @@ template("create_kernel_core_snapshot") {
7171
tool = gen_snapshot_to_use
7272

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

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

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

6565
args = [
6666
"--no_causal_async_stacks",
67-
"--lazy_async_stacks",
6867
"--deterministic",
6968
"--snapshot_kind=app-aot-elf",
7069
"--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
@@ -353,6 +353,10 @@ Application::Application(
353353
settings_.task_observer_remove = std::bind(
354354
&CurrentMessageLoopRemoveAfterTaskObserver, std::placeholders::_1);
355355

356+
// TODO(FL-117): Re-enable causal async stack traces when this issue is
357+
// addressed.
358+
settings_.dart_flags = {"--no_causal_async_stacks"};
359+
356360
// Disable code collection as it interferes with JIT code warmup
357361
// by decreasing usage counters and flushing code which is still useful.
358362
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
@@ -75,8 +75,9 @@ template("core_snapshot") {
7575
tool = gen_snapshot_to_use
7676

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

testing/scenario_app/compile_ios_jit.sh

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

4949
"$DEVICE_TOOLS/gen_snapshot" --deterministic \
5050
--enable-asserts \
51-
--no-causal_async_stacks \
52-
--lazy_async_stacks \
51+
--causal_async_stacks \
5352
--isolate_snapshot_instructions="$OUTDIR/isolate_snapshot_instr" \
5453
--snapshot_kind=app-jit \
5554
--load_vm_snapshot_data="$DEVICE_TOOLS/../gen/flutter/lib/snapshot/vm_isolate_snapshot.bin" \

0 commit comments

Comments
 (0)