From 16697697d4d930b4865cabf4892367dc04e982ce Mon Sep 17 00:00:00 2001 From: Martin Kustermann Date: Mon, 6 Jan 2020 12:15:59 +0000 Subject: [PATCH] [vm] Read causal-async-stacks/lazy-async-stacks from snapshot (instead of requiring AOT runtime to pass same flags as in compiler) We already do this for "use-bare-instructions" and "dwarf-stack-traces". This CL does the same for "causal-async-stacks" and "lazy-async-stacks". Issue https://github.com/dart-lang/sdk/issues/39525 Change-Id: I44136299858b3b72e8a3a176234f5051d6b61c1d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/130364 Reviewed-by: Teagan Strickland Commit-Queue: Martin Kustermann --- runtime/vm/dart.cc | 10 ++-------- runtime/vm/flag_list.h | 2 ++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc index f5ff16c8dfc..15ee844bc9f 100644 --- a/runtime/vm/dart.cc +++ b/runtime/vm/dart.cc @@ -843,8 +843,9 @@ const char* Dart::FeaturesString(Isolate* isolate, ADD_FLAG(#name, value); \ } while (0); - VM_GLOBAL_FLAG_LIST(ADD_FLAG); if (Snapshot::IncludesCode(kind)) { + VM_GLOBAL_FLAG_LIST(ADD_FLAG); + // enabling assertions affects deopt ids. ADD_ISOLATE_FLAG(asserts, enable_asserts, FLAG_enable_asserts); if (kind == Snapshot::kFullJIT) { @@ -852,9 +853,6 @@ const char* Dart::FeaturesString(Isolate* isolate, FLAG_use_field_guards); ADD_ISOLATE_FLAG(use_osr, use_osr, FLAG_use_osr); } - buffer.AddString(FLAG_causal_async_stacks ? " causal_async_stacks" - : " no-causal_async_stacks"); - #if !defined(PRODUCT) buffer.AddString(FLAG_code_comments ? " code-comments" : " no-code-comments"); @@ -890,10 +888,6 @@ const char* Dart::FeaturesString(Isolate* isolate, #endif } - if (FLAG_precompiled_mode && FLAG_dwarf_stack_traces) { - buffer.AddString(" dwarf-stack-traces"); - } - if (Dart::non_nullable_flag()) { buffer.AddString(" nnbd-experiment"); } diff --git a/runtime/vm/flag_list.h b/runtime/vm/flag_list.h index 534d88df845..cb3cb025f4c 100644 --- a/runtime/vm/flag_list.h +++ b/runtime/vm/flag_list.h @@ -250,6 +250,8 @@ constexpr bool kDartUseBackgroundCompilation = true; // V(name, command-line-flag-name) #define VM_GLOBAL_FLAG_LIST(V) \ V(dwarf_stack_traces, FLAG_dwarf_stack_traces) \ + V(causal_async_stacks, FLAG_causal_async_stacks) \ + V(lazy_async_stacks, FLAG_lazy_async_stacks) \ V(use_bare_instructions, FLAG_use_bare_instructions) #endif // RUNTIME_VM_FLAG_LIST_H_