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

Commit ee4d50c

Browse files
Revert "Enable lazy-async-stacks by-default in all modes (2) (#19270)" (#20165)
This reverts commit 06fef5e.
1 parent c134e16 commit ee4d50c

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
@@ -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: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,19 +285,16 @@ TEST_F(ShellTest, AllowedDartVMFlag) {
285285
const std::vector<fml::CommandLine::Option> options = {
286286
#if !FLUTTER_RELEASE
287287
fml::CommandLine::Option("dart-flags",
288-
"--lazy_async_stacks,--no-causal_async_stacks,"
289288
"--max_profile_depth 1,--random_seed 42")
290289
#endif
291290
};
292291
fml::CommandLine command_line("", options, std::vector<std::string>());
293292
flutter::Settings settings = flutter::SettingsFromCommandLine(command_line);
294293

295294
#if !FLUTTER_RELEASE
296-
EXPECT_EQ(settings.dart_flags.size(), 4u);
297-
EXPECT_EQ(settings.dart_flags[0], "--lazy_async_stacks");
298-
EXPECT_EQ(settings.dart_flags[1], "--no-causal_async_stacks");
299-
EXPECT_EQ(settings.dart_flags[2], "--max_profile_depth 1");
300-
EXPECT_EQ(settings.dart_flags[3], "--random_seed 42");
295+
EXPECT_EQ(settings.dart_flags.size(), 2u);
296+
EXPECT_EQ(settings.dart_flags[0], "--max_profile_depth 1");
297+
EXPECT_EQ(settings.dart_flags[1], "--random_seed 42");
301298
#else
302299
EXPECT_EQ(settings.dart_flags.size(), 0u);
303300
#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
#if !defined(FLUTTER_PROFILE)
4243
"--systrace_timeline",

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
@@ -392,6 +392,10 @@ Application::Application(
392392
settings_.task_observer_remove = std::bind(
393393
&CurrentMessageLoopRemoveAfterTaskObserver, std::placeholders::_1);
394394

395+
// TODO(FL-117): Re-enable causal async stack traces when this issue is
396+
// addressed.
397+
settings_.dart_flags = {"--no_causal_async_stacks"};
398+
395399
// Disable code collection as it interferes with JIT code warmup
396400
// by decreasing usage counters and flushing code which is still useful.
397401
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
@@ -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" \

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)