[fuchsia] Switch from core-jit to core snapshots.

Author: akbiggs

shell/platform/fuchsia/dart_runner/dart_component_controller_v2.cc

@@ -213,24 +213,32 @@ bool DartComponentControllerV2::CreateAndBindNamespace() {
 
 bool DartComponentControllerV2::SetUpFromKernel() {
   dart_utils::MappedResource manifest;
+
   if (!dart_utils::MappedResource::LoadFromNamespace(
           namespace_, data_path_ + "/app.dilplist", manifest)) {
     return false;
   }
 
-  if (!dart_utils::MappedResource::LoadFromNamespace(
+  const uint8_t *isolate_data, *isolate_instructions;
+  if (dart_utils::MappedResource::LoadFromNamespace(
           nullptr, "/pkg/data/isolate_core_snapshot_data.bin",
           isolate_snapshot_data_)) {
-    return false;
+    isolate_data = isolate_snapshot_data_.address();
+  } else {
+    FX_LOG(ERROR, LOG_TAG, "Failed to load isolate snapshot data.");
+    isolate_data = nullptr;
   }
-  if (!dart_utils::MappedResource::LoadFromNamespace(
+
+  if (dart_utils::MappedResource::LoadFromNamespace(
           nullptr, "/pkg/data/isolate_core_snapshot_instructions.bin",
           isolate_snapshot_instructions_, true /* executable */)) {
-    return false;
+    isolate_instructions = isolate_snapshot_instructions_.address();
+  } else {
+    FX_LOG(ERROR, LOG_TAG, "Failed to load isolate snapshot instructions.");
+    isolate_instructions = nullptr;
   }
 
-  if (!CreateIsolate(isolate_snapshot_data_.address(),
-                     isolate_snapshot_instructions_.address())) {
+  if (!CreateIsolate(isolate_data, isolate_instructions)) {
     return false;
   }
 

shell/platform/fuchsia/dart_runner/dart_runner.cc

@@ -196,17 +196,20 @@ DartRunner::DartRunner(sys::ComponentContext* context) : context_(context) {
   params.vm_snapshot_data = ::_kDartVmSnapshotData;
   params.vm_snapshot_instructions = ::_kDartVmSnapshotInstructions;
 #else
-  if (!dart_utils::MappedResource::LoadFromNamespace(
+  if (dart_utils::MappedResource::LoadFromNamespace(
           nullptr, "/pkg/data/vm_snapshot_data.bin", vm_snapshot_data_)) {
-    FX_LOG(FATAL, LOG_TAG, "Failed to load vm snapshot data");
+    params.vm_snapshot_data = vm_snapshot_data_.address();
+  } else {
+    FX_LOG(ERROR, LOG_TAG, "Failed to load vm snapshot data");
   }
-  if (!dart_utils::MappedResource::LoadFromNamespace(
+
+  if (dart_utils::MappedResource::LoadFromNamespace(
           nullptr, "/pkg/data/vm_snapshot_instructions.bin",
           vm_snapshot_instructions_, true /* executable */)) {
-    FX_LOG(FATAL, LOG_TAG, "Failed to load vm snapshot instructions");
+    params.vm_snapshot_instructions = vm_snapshot_instructions_.address();
+  } else {
+    FX_LOG(ERROR, LOG_TAG, "Failed to load vm snapshot instructions");
   }
-  params.vm_snapshot_data = vm_snapshot_data_.address();
-  params.vm_snapshot_instructions = vm_snapshot_instructions_.address();
 #endif
   params.create_group = IsolateGroupCreateCallback;
   params.shutdown_isolate = IsolateShutdownCallback;

shell/platform/fuchsia/dart_runner/kernel/BUILD.gn

@@ -65,7 +65,7 @@ template("create_kernel_core_snapshot") {
       "--lazy_async_stacks",
       "--enable_mirrors=false",
       "--deterministic",
-      "--snapshot_kind=core-jit",
+      "--snapshot_kind=core",
       "--vm_snapshot_data=" + rebase_path(vm_snapshot_data, root_build_dir),
       "--vm_snapshot_instructions=" +
           rebase_path(vm_snapshot_instructions, root_build_dir),

shell/platform/fuchsia/dart_runner/service_isolate.cc

@@ -102,22 +102,26 @@ Dart_Isolate CreateServiceIsolate(const char* uri,
       "/pkg/data/isolate_core_snapshot_instructions.bin";
 #endif
 
-    if (!dart_utils::MappedResource::LoadFromNamespace(
+    if (dart_utils::MappedResource::LoadFromNamespace(
             nullptr, snapshot_data_path, mapped_isolate_snapshot_data)) {
-      *error = strdup("Failed to load snapshot for service isolate");
+      vmservice_data = mapped_isolate_snapshot_data.address();
+    } else {
+      *error = strdup("Failed to load snapshot for service isolate data");
       FX_LOG(ERROR, LOG_TAG, *error);
-      return nullptr;
+      vmservice_data = nullptr;
     }
-    if (!dart_utils::MappedResource::LoadFromNamespace(
+
+    if (dart_utils::MappedResource::LoadFromNamespace(
             nullptr, snapshot_instructions_path,
             mapped_isolate_snapshot_instructions, true /* executable */)) {
-      *error = strdup("Failed to load snapshot for service isolate");
+      vmservice_instructions = mapped_isolate_snapshot_instructions.address();
+    } else {
+      *error =
+          strdup("Failed to load snapshot for service isolate instructions");
       FX_LOG(ERROR, LOG_TAG, *error);
-      return nullptr;
+      vmservice_instructions = nullptr;
     }
 
-    vmservice_data = mapped_isolate_snapshot_data.address();
-    vmservice_instructions = mapped_isolate_snapshot_instructions.address();
 #if defined(AOT_RUNTIME)
   }
 #endif

shell/platform/fuchsia/flutter/kernel/BUILD.gn

@@ -69,7 +69,7 @@ template("core_snapshot") {
       "--lazy_async_stacks",
       "--enable_mirrors=false",
       "--deterministic",
-      "--snapshot_kind=core-jit",
+      "--snapshot_kind=core",
       "--vm_snapshot_data=" + rebase_path(vm_snapshot_data, root_build_dir),
       "--vm_snapshot_instructions=" +
           rebase_path(vm_snapshot_instructions, root_build_dir),