- Convert all isolate flags to a bit field.

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "include/dart_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 
 #include "lib/stacktrace.h"
 #include "platform/assert.h"
@@ skipping 41 matching lines @@
 #include "vm/unicode.h"
 #include "vm/uri.h"
 #include "vm/verifier.h"
 #include "vm/version.h"
 
 namespace dart {
 
 // Facilitate quick access to the current zone once we have the current thread.
 #define Z (T->zone())
 
-DECLARE_FLAG(bool, use_dart_frontend);
 DECLARE_FLAG(bool, print_class_table);
 DECLARE_FLAG(bool, verify_handles);
-DECLARE_FLAG(bool, use_dart_frontend);
 #if defined(DART_NO_SNAPSHOT)
 DEFINE_FLAG(bool,
             check_function_fingerprints,
             true,
             "Check function fingerprints");
 #endif  // defined(DART_NO_SNAPSHOT).
 DEFINE_FLAG(bool,
             verify_acquired_data,
             false,
             "Verify correct API acquire/release of typed data.");
@@ skipping 1010 matching lines @@
   if (params->version != DART_INITIALIZE_PARAMS_CURRENT_VERSION) {
     return strdup(
         "Dart_Initialize: "
         "Invalid Dart_InitializeParams version.");
   }
 
   return Dart::InitOnce(
       params->vm_snapshot_data, params->vm_snapshot_instructions,
       params->create, params->shutdown, params->cleanup, params->thread_exit,
       params->file_open, params->file_read, params->file_write,
-      params->file_close, params->entropy_source, params->get_service_assets);
+      params->file_close, params->entropy_source, params->get_service_assets,
+      params->start_kernel_isolate);
 }
 
 DART_EXPORT char* Dart_Cleanup() {
   CHECK_NO_ISOLATE(Isolate::Current());
   const char* err_msg = Dart::Cleanup();
   if (err_msg != NULL) {
     return strdup(err_msg);
   }
   return NULL;
 }
@@ skipping 113 matching lines @@
   return CreateIsolate(script_uri, main, snapshot_data, snapshot_instructions,
                        -1, NULL, flags, callback_data, error);
 }
 
 DART_EXPORT Dart_Isolate Dart_CreateIsolateFromKernel(const char* script_uri,
                                                       const char* main,
                                                       void* kernel_program,
                                                       Dart_IsolateFlags* flags,
                                                       void* callback_data,
                                                       char** error) {
+  // Setup default flags in case none were passed.
+  Dart_IsolateFlags api_flags;
+  if (flags == NULL) {
+    Isolate::FlagsInitialize(&api_flags);
+    flags = &api_flags;
+  }
+  flags->use_dart_frontend = true;
   return CreateIsolate(script_uri, main, NULL, NULL, -1,
                        reinterpret_cast<kernel::Program*>(kernel_program),
                        flags, callback_data, error);
 }
 
 DART_EXPORT void Dart_ShutdownIsolate() {
   Thread* T = Thread::Current();
   Isolate* I = T->isolate();
   CHECK_ISOLATE(I);
   I->WaitForOutstandingSpawns();
@@ skipping 3869 matching lines @@
   }
   if (column_offset < 0) {
     return Api::NewError("%s: argument 'column_offset' must be positive number",
                          CURRENT_FUNC);
   }
   CHECK_CALLBACK_STATE(T);
   CHECK_COMPILATION_ALLOWED(I);
 
   Dart_Handle result;
 #if !defined(DART_PRECOMPILED_RUNTIME)
-  if (FLAG_use_dart_frontend && !KernelIsolate::IsKernelIsolate(I)) {
+  if (I->use_dart_frontend()) {
     if ((source == Api::Null()) || (source == NULL)) {
       RETURN_NULL_ERROR(source);
     }
     void* kernel_pgm = reinterpret_cast<void*>(source);
     result = LoadKernelProgram(T, resolved_url_str, kernel_pgm);
     if (::Dart_IsError(result)) {
       return result;
     }
     library ^= Library::LookupLibrary(T, resolved_url_str);
     if (library.IsNull()) {
@@ skipping 333 matching lines @@
   API_TIMELINE_DURATION;
   DARTSCOPE(Thread::Current());
   Isolate* I = T->isolate();
 
   const String& url_str = Api::UnwrapStringHandle(Z, url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(Z, url, String);
   }
   Dart_Handle result;
 #if !defined(DART_PRECOMPILED_RUNTIME)
-  // Kernel isolate is loaded from script in case of dart_bootstrap
-  // even when FLAG_use_dart_frontend is true. Hence, do not interpret
-  // |source| as a kernel if the current isolate is the kernel isolate.
-  if (FLAG_use_dart_frontend && !KernelIsolate::IsKernelIsolate(I)) {
+  if (I->use_dart_frontend()) {
     result = LoadKernelProgram(T, url_str, reinterpret_cast<void*>(source));
     if (::Dart_IsError(result)) {
       return result;
     }
     return Api::NewHandle(T, Library::LookupLibrary(T, url_str));
   }
 #endif
   if (::Dart_IsNull(resolved_url)) {
     resolved_url = url;
   }
@@ skipping 1295 matching lines @@
 #endif
 }
 
 DART_EXPORT void Dart_DumpNativeStackTrace(void* context) {
 #ifndef PRODUCT
   Profiler::DumpStackTrace(context);
 #endif
 }
 
 }  // namespace dart