Revert "Enable lazy-async-stacks by-default in all modes (2) (flutter…

…#19270)" (flutter#20165) This reverts commit 06fef5e.
knopp · Jul 31, 2020 · ee4d50c · ee4d50c
1 parent c134e16
commit ee4d50c
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 17 deletions.
diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc
@@ -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
 };
 

diff --git a/shell/common/shell_unittests.cc b/shell/common/shell_unittests.cc
@@ -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

diff --git a/shell/platform/fuchsia/dart_runner/dart_runner.cc b/shell/platform/fuchsia/dart_runner/dart_runner.cc
@@ -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",

diff --git a/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn b/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn
@@ -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),

diff --git a/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn b/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn
@@ -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",

diff --git a/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn b/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn
@@ -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),

diff --git a/shell/platform/fuchsia/flutter/component.cc b/shell/platform/fuchsia/flutter/component.cc
@@ -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");

diff --git a/shell/platform/fuchsia/flutter/kernel/BUILD.gn b/shell/platform/fuchsia/flutter/kernel/BUILD.gn
@@ -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",

diff --git a/testing/scenario_app/compile_ios_jit.sh b/testing/scenario_app/compile_ios_jit.sh
@@ -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" \

diff --git a/testing/testing.gni b/testing/testing.gni
@@ -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),