CoreJIT snapshots without training.

runtime/bin/BUILD.gn

 # Copyright (c) 2014, 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.
 
 import("gypi_contents.gni")
 import("../runtime_args.gni")
 import("../../build/compiled_action.gni")
 
 # Generate a resources.cc file for the service isolate without Observatory.
 action("gen_resources_cc") {
@@ skipping 442 matching lines @@
 
 dart_io("standalone_dart_io") {
   extra_sources = []
 }
 
 action("generate_snapshot_bin") {
   deps = [
     "../bin:gen_snapshot($host_toolchain)",
   ]
 
-  vm_isolate_snapshot = "$target_gen_dir/vm_isolate_snapshot.bin"
-  isolate_snapshot = "$target_gen_dir/isolate_snapshot.bin"
+  vm_snapshot_data = "$target_gen_dir/vm_snapshot_data.bin"
+  vm_snapshot_instructions = "$target_gen_dir/vm_snapshot_instructions.bin"
+  isolate_snapshot_data = "$target_gen_dir/isolate_snapshot_data.bin"
+  isolate_snapshot_instructions =
+      "$target_gen_dir/isolate_snapshot_instructions.bin"
   gen_snapshot_stamp_file = "$target_gen_dir/gen_snapshot.stamp"
   outputs = [
-    vm_isolate_snapshot,
-    isolate_snapshot,
+    vm_snapshot_data,
+    vm_snapshot_instructions,
+    isolate_snapshot_data,
+    isolate_snapshot_instructions,
     gen_snapshot_stamp_file,
   ]
 
+  snapshot_kind = "core"
+
+  # Putting code in the core snapshot breaks tests that use non-default flags.
+  # snapshot_kind = "core-jit"
+
   gen_snapshot_dir =
       get_label_info("../bin:gen_snapshot($host_toolchain)", "root_out_dir")
 
   script = rebase_path("../tools/create_snapshot_bin.py")
   args = [
     "--executable",
     rebase_path("$gen_snapshot_dir/gen_snapshot"),
     "--snapshot_kind",
-    "core",
+    snapshot_kind,
     "--vm_output_bin",
-    rebase_path(vm_isolate_snapshot, root_build_dir),
+    rebase_path(vm_snapshot_data, root_build_dir),
+    "--vm_instructions_output_bin",
+    rebase_path(vm_snapshot_instructions, root_build_dir),
     "--isolate_output_bin",
-    rebase_path(isolate_snapshot, root_build_dir),
-    "--target_os",
-    current_os,
+    rebase_path(isolate_snapshot_data, root_build_dir),
+    "--isolate_instructions_output_bin",
+    rebase_path(isolate_snapshot_instructions, root_build_dir),
     "--timestamp_file",
     rebase_path(gen_snapshot_stamp_file, root_build_dir),
   ]
 }
 
 # Generates an assembly file defining a given symbol with the bytes from a
 # binary file. Places the symbol in a text section if 'executable' is true,
 # otherwise places the symbol in a read-only data section.
 template("bin_to_assembly") {
   assert(defined(invoker.deps), "Must define deps")
@@ skipping 25 matching lines @@
     outputs = [
       invoker.output,
     ]
   }
 }
 
 bin_to_assembly("vm_snapshot_data_assembly") {
   deps = [
     ":generate_snapshot_bin",
   ]
-  input = "$target_gen_dir/vm_isolate_snapshot.bin"
+  input = "$target_gen_dir/vm_snapshot_data.bin"
   output = "$target_gen_dir/vm_snapshot_data.S"
   symbol = "kDartVmSnapshotData"
   executable = false
 }
 
 bin_to_assembly("vm_snapshot_instructions_assembly") {
-  deps = []
-  input = "../tools/empty.bin"
+  deps = [
+    ":generate_snapshot_bin",
+  ]
+  input = "$target_gen_dir/vm_snapshot_instructions.bin"
   output = "$target_gen_dir/vm_snapshot_instructions.S"
   symbol = "kDartVmSnapshotInstructions"
   executable = true
 }
 
 bin_to_assembly("isolate_snapshot_data_assembly") {
   deps = [
     ":generate_snapshot_bin",
   ]
-  input = "$target_gen_dir/isolate_snapshot.bin"
+  input = "$target_gen_dir/isolate_snapshot_data.bin"
   output = "$target_gen_dir/isolate_snapshot_data.S"
   symbol = "kDartCoreIsolateSnapshotData"
   executable = false
 }
 
 bin_to_assembly("isolate_snapshot_instructions_assembly") {
-  deps = []
-  input = "../tools/empty.bin"
+  deps = [
+    ":generate_snapshot_bin",
+  ]
+  input = "$target_gen_dir/isolate_snapshot_instructions.bin"
   output = "$target_gen_dir/isolate_snapshot_instructions.S"
   symbol = "kDartCoreIsolateSnapshotInstructions"
   executable = true
 }
 
 source_set("dart_snapshot_cc") {
   deps = [
     ":isolate_snapshot_data_assembly",
     ":isolate_snapshot_instructions_assembly",
     ":vm_snapshot_data_assembly",
@@ skipping 343 matching lines @@
   ]
   if (is_linux || is_android) {
     cflags = [ "-fPIC" ]
   }
   if (is_win) {
     libs = [ "dart.lib" ]
     abs_root_out_dir = rebase_path(root_out_dir)
     ldflags = [ "/LIBPATH:$abs_root_out_dir" ]
   }
 }