commit 74792f4b9cb1aba59c3ad0ea554ecbc71d5a75a3
author Alexander Markov <alexmarkov@google.com> Mon Oct 22 20:51:48 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Mon Oct 22 20:51:48 2018 +0000
tree 478a04dc0c283be22d02a800b09e39e4cc2e1315
parent b4fbf1a065ac27460c2f1988525a2678c20c4ccd

Revert "[vm] Revert service isolate setup in main.cc"

This reverts commit 0eb5dbffacf22b484b9e37b49475c06c3f3b065d.

Reason for revert: the root cause of crashes is fixed, so
there is no need in the workaround anymore.

Change-Id: Ifc3b5027193c2d5db4a43f451996607b9558fe78
Reviewed-on: https://dart-review.googlesource.com/c/80540
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Siva Annamalai <asiva@google.com>
Auto-Submit: Alexander Markov <alexmarkov@google.com>
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Siva Annamalai <asiva@google.com>

runtime/bin/main.cc

diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index 691b3c1..052fa2f 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -482,25 +482,13 @@
   // Set flag to load and retain the vmservice library.
   ASSERT(flags != NULL);
   flags->load_vmservice_library = true;
-
-  // If there is intention to use DFE, then we create the isolate
-  // from kernel only if we can.
-  const uint8_t* kernel_buffer = NULL;
-  intptr_t kernel_buffer_size = 0;
-  dfe.LoadPlatform(&kernel_buffer, &kernel_buffer_size);
-  if (kernel_buffer == NULL) {
-    dfe.application_kernel_buffer(&kernel_buffer, &kernel_buffer_size);
-  }
-
-  if (kernel_buffer != NULL) {
-    isolate = Dart_CreateIsolateFromKernel(script_uri, NULL, kernel_buffer,
-                                           kernel_buffer_size, flags,
-                                           isolate_data, error);
-  } else {
-    *error = strdup("Platform file not available to create service isolate.");
-    delete isolate_data;
-    return NULL;
-  }
+  const uint8_t* isolate_snapshot_data = core_isolate_snapshot_data;
+  const uint8_t* isolate_snapshot_instructions =
+      core_isolate_snapshot_instructions;
+  isolate = Dart_CreateIsolate(
+      script_uri, NULL, isolate_snapshot_data, isolate_snapshot_instructions,
+      app_isolate_shared_data, app_isolate_shared_instructions, flags,
+      isolate_data, error);
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)
   if (isolate == NULL) {
     delete isolate_data;