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

runtime/vm/thread_test.cc

Index: runtime/vm/thread_test.cc
diff --git a/runtime/vm/thread_test.cc b/runtime/vm/thread_test.cc
index 058ed3f2b1feabc1bdc184f587d1a5d0992c936a..c9c83e4a70d269461141ed6c2f331dcf540c151a 100644
--- a/runtime/vm/thread_test.cc
+++ b/runtime/vm/thread_test.cc
@@ -15,8 +15,8 @@ namespace dart {
 
 UNIT_TEST_CASE(Mutex) {
   // This unit test case needs a running isolate.
-  Dart_CreateIsolate(NULL, NULL, bin::core_isolate_snapshot_buffer, NULL, NULL,
-                     NULL);
+  Dart_CreateIsolate(NULL, NULL, bin::core_isolate_snapshot_data,
+                     bin::core_isolate_snapshot_instructions, NULL, NULL, NULL);
 
   Mutex* mutex = new Mutex();
   mutex->Lock();
@@ -37,8 +37,8 @@ UNIT_TEST_CASE(Mutex) {
 
 UNIT_TEST_CASE(Monitor) {
   // This unit test case needs a running isolate.
-  Dart_CreateIsolate(NULL, NULL, bin::core_isolate_snapshot_buffer, NULL, NULL,
-                     NULL);
+  Dart_CreateIsolate(NULL, NULL, bin::core_isolate_snapshot_data,
+                     bin::core_isolate_snapshot_instructions, NULL, NULL, NULL);
   OSThread* thread = OSThread::Current();
   // Thread interrupter interferes with this test, disable interrupts.
   thread->DisableThreadInterrupts();
@@ -389,14 +389,14 @@ TEST_CASE(ThreadRegistry) {
   char* orig_str = orig_zone->PrintToString("foo");
   Dart_ExitIsolate();
   // Create and enter a new isolate.
-  Dart_CreateIsolate(NULL, NULL, bin::core_isolate_snapshot_buffer, NULL, NULL,
-                     NULL);
+  Dart_CreateIsolate(NULL, NULL, bin::core_isolate_snapshot_data,
+                     bin::core_isolate_snapshot_instructions, NULL, NULL, NULL);
   Zone* zone0 = Thread::Current()->zone();
   EXPECT(zone0 != orig_zone);
   Dart_ShutdownIsolate();
   // Create and enter yet another isolate.
-  Dart_CreateIsolate(NULL, NULL, bin::core_isolate_snapshot_buffer, NULL, NULL,
-                     NULL);
+  Dart_CreateIsolate(NULL, NULL, bin::core_isolate_snapshot_data,
+                     bin::core_isolate_snapshot_instructions, NULL, NULL, NULL);
   {
     // Create a stack resource this time, and exercise it.
     StackZone stack_zone(Thread::Current());