Move flags strong/sync-async/reify-generic-functions back to global vm flags (they are not set as isolate specific flags).

Change-Id: I4d5cba4f5ac657a0834e3755312147cff1fbc001
Reviewed-on: https://dart-review.googlesource.com/71426
Commit-Queue: Siva Annamalai <[email protected]>
Reviewed-by: Zach Anderson <[email protected]>

Author: a-siva

runtime/bin/BUILD.gn

@@ -661,6 +661,13 @@ gen_snapshot_action("generate_snapshot_bin") {
   ]
   args = [
     "--deterministic",
+
+    # TODO(asiva) remove these flags once the core snapshot is switched to
+    # dart 2.
+    "--no-strong",
+    "--no-sync-async",
+    "--reify-generic-functions",
+
     "--snapshot_kind=" + dart_core_snapshot_kind,
     "--vm_snapshot_data=" + rebase_path(vm_snapshot_data, root_build_dir),
     "--vm_snapshot_instructions=" +

runtime/bin/main.cc

@@ -448,7 +448,7 @@ static Dart_Isolate CreateAndSetupKernelIsolate(const char* script_uri,
     packages_config = Options::packages_file();
   }
 
-  Dart_Isolate isolate;
+  Dart_Isolate isolate = NULL;
   IsolateData* isolate_data = NULL;
   bool isolate_run_app_snapshot = false;
   AppSnapshot* app_snapshot = NULL;
@@ -470,7 +470,8 @@ static Dart_Isolate CreateAndSetupKernelIsolate(const char* script_uri,
         DART_KERNEL_ISOLATE_NAME, main, isolate_snapshot_data,
         isolate_snapshot_instructions, app_isolate_shared_data,
         app_isolate_shared_instructions, flags, isolate_data, error);
-  } else {
+  }
+  if (isolate == NULL) {
     const uint8_t* kernel_service_buffer = NULL;
     intptr_t kernel_service_buffer_size = 0;
     dfe.LoadKernelService(&kernel_service_buffer, &kernel_service_buffer_size);
@@ -890,7 +891,7 @@ bool RunMainIsolate(const char* script_name, CommandLineOptions* dart_options) {
   }
 
   Dart_Isolate isolate = NULL;
-  if (flags.strong && Options::gen_snapshot_kind() == kAppAOT) {
+  if (Options::preview_dart_2() && Options::gen_snapshot_kind() == kAppAOT) {
     isolate = IsolateSetupHelperAotCompilationDart2(
         script_name, "main", Options::package_root(), Options::packages_file(),
         &flags, &error, &exit_code);
@@ -1261,8 +1262,9 @@ void main(int argc, char** argv) {
   init_params.entropy_source = DartUtils::EntropySource;
   init_params.get_service_assets = GetVMServiceAssetsArchiveCallback;
 #if !defined(DART_PRECOMPILED_RUNTIME)
-  init_params.start_kernel_isolate =
-      dfe.UseDartFrontend() && dfe.CanUseDartFrontend();
+  init_params.start_kernel_isolate = Options::preview_dart_2() &&
+                                     dfe.UseDartFrontend() &&
+                                     dfe.CanUseDartFrontend();
 #else
   init_params.start_kernel_isolate = false;
 #endif

runtime/bin/main_options.cc

@@ -63,12 +63,6 @@ ENUM_OPTIONS_LIST(ENUM_OPTION_DEFINITION)
 CB_OPTIONS_LIST(CB_OPTION_DEFINITION)
 #undef CB_OPTION_DEFINITION
 
-void Options::SetDart2Options(CommandLineOptions* vm_options) {
-  vm_options->AddArgument("--strong");
-  vm_options->AddArgument("--reify-generic-functions");
-  vm_options->AddArgument("--sync-async");
-}
-
 void Options::SetDart1Options(CommandLineOptions* vm_options) {
   vm_options->AddArgument("--no-strong");
   vm_options->AddArgument("--no-reify-generic-functions");
@@ -348,9 +342,6 @@ int Options::ParseArguments(int argc,
   const char* kPrefix = "--";
   const intptr_t kPrefixLen = strlen(kPrefix);
 
-  // Set Dart 2 as the default option.
-  Options::SetDart2Options(vm_options);
-
   // Store the executable name.
   Platform::SetExecutableName(argv[0]);
 

runtime/bin/main_options.h

@@ -112,7 +112,6 @@ class Options {
 #undef CB_OPTIONS_DECL
 
   static bool preview_dart_2() { return !no_preview_dart_2(); }
-  static void SetDart2Options(CommandLineOptions* vm_options);
   static void SetDart1Options(CommandLineOptions* vm_options);
 
   static dart::SimpleHashMap* environment() { return environment_; }

runtime/bin/run_vm_tests.cc

@@ -150,7 +150,8 @@ static Dart_Isolate CreateIsolateAndSetup(const char* script_uri,
     isolate = Dart_CreateIsolate(
         DART_KERNEL_ISOLATE_NAME, main, isolate_snapshot_data,
         isolate_snapshot_instructions, NULL, NULL, flags, isolate_data, error);
-  } else {
+  }
+  if (isolate == NULL) {
     bin::dfe.Init();
     bin::dfe.LoadKernelService(&kernel_service_buffer,
                                &kernel_service_buffer_size);
@@ -262,13 +263,27 @@ static int Main(int argc, const char** argv) {
     dart_argc = argc - 2;
     dart_argv = &argv[1];
   }
+  const char* error;
+  if (!start_kernel_isolate) {
+    int extra_argc = dart_argc + 3;
+    const char** extra_argv = new const char*[extra_argc];
+    for (intptr_t i = 0; i < dart_argc; i++) {
+      extra_argv[i] = dart_argv[i];
+    }
+    extra_argv[dart_argc] = "--no-strong";
+    extra_argv[dart_argc + 1] = "--no-reify-generic-arguments";
+    extra_argv[dart_argc + 2] = "--no-sync-async";
+    error = Flags::ProcessCommandLineFlags(extra_argc, extra_argv);
+    ASSERT(error == NULL);
+  } else {
+    error = Flags::ProcessCommandLineFlags(dart_argc, dart_argv);
+    ASSERT(error == NULL);
+  }
 
   bin::Thread::InitOnce();
   bin::TimerUtils::InitOnce();
   bin::EventHandler::Start();
 
-  const char* error = Flags::ProcessCommandLineFlags(dart_argc, dart_argv);
-  ASSERT(error == NULL);
 
   error = Dart::InitOnce(
       dart::bin::vm_snapshot_data, dart::bin::vm_snapshot_instructions,

runtime/include/dart_api.h

@@ -553,7 +553,7 @@ typedef struct {
  * for each part.
  */
 
-#define DART_FLAGS_CURRENT_VERSION (0x00000006)
+#define DART_FLAGS_CURRENT_VERSION (0x00000007)
 
 typedef struct {
   int32_t version;
@@ -566,10 +566,7 @@ typedef struct {
   bool use_dart_frontend;
   bool obfuscate;
   Dart_QualifiedFunctionName* entry_points;
-  bool reify_generic_functions;
-  bool strong;
   bool load_vmservice_library;
-  bool sync_async;
   bool unsafe_trust_strong_mode_types;
 } Dart_IsolateFlags;
 

runtime/lib/isolate.cc

@@ -361,7 +361,7 @@ DEFINE_NATIVE_ENTRY(Isolate_spawnUri, 12) {
     Dart_IsolateFlags* flags = state->isolate_flags();
     flags->enable_asserts = is_checked;
     // Do not enable type checks in strong mode.
-    flags->enable_type_checks = is_checked && !flags->strong;
+    flags->enable_type_checks = is_checked && !FLAG_strong;
   }
 
   ThreadPool::Task* spawn_task = new SpawnIsolateTask(state);

runtime/lib/object.cc

@@ -380,7 +380,7 @@ DEFINE_NATIVE_ENTRY(Internal_extractTypeArguments, 2) {
   Class& interface_cls = Class::Handle(zone);
   intptr_t num_type_args = 0;  // Remains 0 when executing Dart 1.0 code.
   // TODO(regis): Check for strong mode too?
-  if (Isolate::Current()->reify_generic_functions()) {
+  if (FLAG_reify_generic_functions) {
     const TypeArguments& function_type_args =
         TypeArguments::Handle(zone, arguments->NativeTypeArgs());
     if (function_type_args.Length() == 1) {

runtime/vm/class_finalizer.cc

@@ -449,8 +449,7 @@ void ClassFinalizer::ResolveRedirectingFactoryTarget(
     return;
   }
 
-  Isolate* isolate = Isolate::Current();
-  if (isolate->error_on_bad_override() && !isolate->strong()) {
+  if (!FLAG_strong && Isolate::Current()->error_on_bad_override()) {
     // Verify that the target is compatible with the redirecting factory.
     Error& error = Error::Handle();
     if (!target.HasCompatibleParametersWith(factory, &error)) {
@@ -564,7 +563,7 @@ void ClassFinalizer::ResolveTypeClass(const Class& cls, const Type& type) {
          (type.signature() != Function::null()));
 
   // In non-strong mode, replace FutureOr<T> type of async library with dynamic.
-  if (type_class.IsFutureOrClass() && !Isolate::Current()->strong()) {
+  if (type_class.IsFutureOrClass() && !FLAG_strong) {
     Type::Cast(type).set_type_class(Class::Handle(Object::dynamic_class()));
     type.set_arguments(Object::null_type_arguments());
   }
@@ -1226,7 +1225,7 @@ RawAbstractType* ClassFinalizer::FinalizeType(const Class& cls,
     // malformed.
     if ((finalization >= kCanonicalize) && !type.IsMalformed() &&
         !type.IsCanonical() && type.IsType()) {
-      if (!Isolate::Current()->strong()) {
+      if (!FLAG_strong) {
         CheckTypeBounds(cls, type);
       }
       return type.Canonicalize();
@@ -1370,7 +1369,7 @@ RawAbstractType* ClassFinalizer::FinalizeType(const Class& cls,
 
   // If we are done finalizing a graph of mutually recursive types, check their
   // bounds.
-  if (is_root_type && !Isolate::Current()->strong()) {
+  if (is_root_type && !FLAG_strong) {
     for (intptr_t i = pending_types->length() - 1; i >= 0; i--) {
       const AbstractType& type = pending_types->At(i);
       if (!type.IsMalformed() && !type.IsCanonical()) {
@@ -1634,7 +1633,7 @@ void ClassFinalizer::ResolveAndFinalizeMemberTypes(const Class& cls) {
   String& other_name = String::Handle(zone);
   Class& super_class = Class::Handle(zone);
   const intptr_t num_fields = array.Length();
-  const bool track_exactness = isolate->strong() && isolate->use_field_guards();
+  const bool track_exactness = FLAG_strong && isolate->use_field_guards();
   for (intptr_t i = 0; i < num_fields; i++) {
     field ^= array.At(i);
     type = field.type();
@@ -1743,7 +1742,7 @@ void ClassFinalizer::ResolveAndFinalizeMemberTypes(const Class& cls) {
   // If we check for bad overrides, collect interfaces, super interfaces, and
   // super classes of this class.
   GrowableArray<const Class*> interfaces(zone, 4);
-  if (isolate->error_on_bad_override() && !isolate->strong()) {
+  if (isolate->error_on_bad_override() && !FLAG_strong) {
     CollectInterfaces(cls, &interfaces);
     // Include superclasses in list of interfaces and super interfaces.
     super_class = cls.SuperClass();
@@ -1765,7 +1764,7 @@ void ClassFinalizer::ResolveAndFinalizeMemberTypes(const Class& cls) {
     FinalizeSignature(cls, function);
     name = function.name();
     // Report signature conflicts only.
-    if (isolate->error_on_bad_override() && !isolate->strong() &&
+    if (isolate->error_on_bad_override() && !FLAG_strong &&
         !function.is_static() && !function.IsGenerativeConstructor()) {
       // A constructor cannot override anything.
       for (intptr_t i = 0; i < interfaces.length(); i++) {
@@ -2787,7 +2786,7 @@ void ClassFinalizer::FinalizeClass(const Class& cls) {
   }
   // Ensure interfaces are finalized in case we check for bad overrides.
   Isolate* isolate = Isolate::Current();
-  if (isolate->error_on_bad_override() && !isolate->strong()) {
+  if (isolate->error_on_bad_override() && !FLAG_strong) {
     GrowableArray<const Class*> interfaces(4);
     CollectInterfaces(cls, &interfaces);
     for (intptr_t i = 0; i < interfaces.length(); i++) {

runtime/vm/compiler/backend/flow_graph.cc

@@ -1048,7 +1048,7 @@ void FlowGraph::Rename(GrowableArray<PhiInstr*>* live_phis,
 
   // Check if inlining_parameters include a type argument vector parameter.
   const intptr_t inlined_type_args_param =
-      (isolate()->reify_generic_functions() && (inlining_parameters != NULL) &&
+      (FLAG_reify_generic_functions && (inlining_parameters != NULL) &&
        function().IsGeneric())
           ? 1
           : 0;
@@ -1091,7 +1091,7 @@ void FlowGraph::Rename(GrowableArray<PhiInstr*>* live_phis,
 
     if (!IsCompiledForOsr()) {
       const bool reify_generic_argument =
-          function().IsGeneric() && isolate()->reify_generic_functions();
+          function().IsGeneric() && FLAG_reify_generic_functions;
 
       // Replace the type arguments slot with a special parameter.
       if (reify_generic_argument) {