Refactor snapshots pieces to include a section for loading instructions into the heap of a regular …

runtime/vm/benchmark_test.h

Index: runtime/vm/benchmark_test.h
diff --git a/runtime/vm/benchmark_test.h b/runtime/vm/benchmark_test.h
index c30432649b26ea8d54dd7b075527f93225f98701..edc9bfce882324b6f24ef8e469864b9491e765fc 100644
--- a/runtime/vm/benchmark_test.h
+++ b/runtime/vm/benchmark_test.h
@@ -20,13 +20,11 @@ DECLARE_FLAG(int, code_heap_size);
 DECLARE_FLAG(int, old_gen_growth_space_ratio);
 
 namespace bin {
-// vm_isolate_snapshot_buffer points to a snapshot for the vm isolate if we
-// link in a snapshot otherwise it is initialized to NULL.
-extern const uint8_t* vm_isolate_snapshot_buffer;
-
-// isolate_snapshot_buffer points to a snapshot for an isolate if we link in a
-// snapshot otherwise it is initialized to NULL.
-extern const uint8_t* core_isolate_snapshot_buffer;
+// Snapshot pieces if we link in a snapshot, otherwise initialized to NULL.
+extern const uint8_t* vm_snapshot_data;
+extern const uint8_t* vm_snapshot_instructions;
+extern const uint8_t* core_isolate_snapshot_data;
+extern const uint8_t* core_isolate_snapshot_instructions;
 }
 
 // The BENCHMARK macros are used for benchmarking a specific functionality
@@ -82,7 +80,8 @@ class Benchmark {
   int64_t score() const { return score_; }
   Isolate* isolate() const { return reinterpret_cast<Isolate*>(isolate_); }
 
-  Dart_Isolate CreateIsolate(const uint8_t* buffer);
+  Dart_Isolate CreateIsolate(const uint8_t* snapshot_data,
+                             const uint8_t* snapshot_instructions);
 
   void Run() { (*run_)(this); }
   void RunBenchmark();
@@ -110,7 +109,8 @@ class Benchmark {
 class BenchmarkIsolateScope {
  public:
   explicit BenchmarkIsolateScope(Benchmark* benchmark) : benchmark_(benchmark) {
-    benchmark_->CreateIsolate(bin::core_isolate_snapshot_buffer);
+    benchmark_->CreateIsolate(bin::core_isolate_snapshot_data,
+                              bin::core_isolate_snapshot_instructions);
     Dart_EnterScope();  // Create a Dart API scope for unit benchmarks.
   }
   ~BenchmarkIsolateScope() {