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

runtime/vm/snapshot_test.cc

 // Copyright (c) 2012, 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.
 
 #include "platform/globals.h"
 
 #include "include/dart_tools_api.h"
 #include "platform/assert.h"
 #include "vm/class_finalizer.h"
 #include "vm/clustered_snapshot.h"
@@ skipping 1146 matching lines @@
       "class FieldsTest {\n"
       "  static Fields testMain() {\n"
       "    Expect.equals(true, Fields.bigint_sfld == 0xfffffffffff);\n"
       "    Fields obj = new Fields(10, 20);\n"
       "    Expect.equals(true, obj.bigint_fld == 0xfffffffffff);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  uint8_t* isolate_snapshot_buffer;
+  uint8_t* isolate_snapshot_data_buffer;
 
   // Start an Isolate, load a script and create a full snapshot.
   Timer timer1(true, "Snapshot_test");
   timer1.Start();
   {
     TestIsolateScope __test_isolate__;
 
     Thread* thread = Thread::Current();
     StackZone zone(thread);
     HandleScope scope(thread);
 
     // Create a test library and Load up a test script in it.
     TestCase::LoadTestScript(kScriptChars, NULL);
     EXPECT_VALID(Api::CheckAndFinalizePendingClasses(thread));
     timer1.Stop();
     OS::PrintErr("Without Snapshot: %" Pd64 "us\n", timer1.TotalElapsedTime());
 
     // Write snapshot with object content.
     {
-      FullSnapshotWriter writer(Snapshot::kCore, NULL, &isolate_snapshot_buffer,
-                                &malloc_allocator,
-                                NULL /* instructions_writer */);
+      FullSnapshotWriter writer(
+          Snapshot::kCore, NULL, &isolate_snapshot_data_buffer,
+          &malloc_allocator, NULL, NULL /* instructions_writer */);
       writer.WriteFullSnapshot();
     }
   }
 
   // Now Create another isolate using the snapshot and execute a method
   // from the script.
   Timer timer2(true, "Snapshot_test");
   timer2.Start();
-  TestCase::CreateTestIsolateFromSnapshot(isolate_snapshot_buffer);
+  TestCase::CreateTestIsolateFromSnapshot(isolate_snapshot_data_buffer);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
     timer2.Stop();
     OS::PrintErr("From Snapshot: %" Pd64 "us\n", timer2.TotalElapsedTime());
 
     // Invoke a function which returns an object.
     Dart_Handle cls = Dart_GetClass(TestCase::lib(), NewString("FieldsTest"));
     result = Dart_Invoke(cls, NewString("testMain"), 0, NULL);
     EXPECT_VALID(result);
     Dart_ExitScope();
   }
   Dart_ShutdownIsolate();
-  free(isolate_snapshot_buffer);
+  free(isolate_snapshot_data_buffer);
 }
 
 
 UNIT_TEST_CASE(FullSnapshot1) {
   // This buffer has to be static for this to compile with Visual Studio.
   // If it is not static compilation of this file with Visual Studio takes
   // more than 30 minutes!
   static const char kFullSnapshotScriptChars[] = {
 #include "snapshot_test.dat"
   };
   const char* kScriptChars = kFullSnapshotScriptChars;
 
-  uint8_t* isolate_snapshot_buffer;
+  uint8_t* isolate_snapshot_data_buffer;
 
   // Start an Isolate, load a script and create a full snapshot.
   Timer timer1(true, "Snapshot_test");
   timer1.Start();
   {
     TestIsolateScope __test_isolate__;
 
     Thread* thread = Thread::Current();
     StackZone zone(thread);
     HandleScope scope(thread);
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
     EXPECT_VALID(Api::CheckAndFinalizePendingClasses(thread));
     timer1.Stop();
     OS::PrintErr("Without Snapshot: %" Pd64 "us\n", timer1.TotalElapsedTime());
 
     // Write snapshot with object content.
     {
-      FullSnapshotWriter writer(Snapshot::kCore, NULL, &isolate_snapshot_buffer,
-                                &malloc_allocator,
-                                NULL /* instructions_writer */);
+      FullSnapshotWriter writer(
+          Snapshot::kCore, NULL, &isolate_snapshot_data_buffer,
+          &malloc_allocator, NULL, NULL /* instructions_writer */);
       writer.WriteFullSnapshot();
     }
 
     // Invoke a function which returns an object.
     Dart_Handle cls = Dart_GetClass(lib, NewString("FieldsTest"));
     Dart_Handle result = Dart_Invoke(cls, NewString("testMain"), 0, NULL);
     EXPECT_VALID(result);
   }
 
   // Now Create another isolate using the snapshot and execute a method
   // from the script.
   Timer timer2(true, "Snapshot_test");
   timer2.Start();
-  TestCase::CreateTestIsolateFromSnapshot(isolate_snapshot_buffer);
+  TestCase::CreateTestIsolateFromSnapshot(isolate_snapshot_data_buffer);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
     timer2.Stop();
     OS::PrintErr("From Snapshot: %" Pd64 "us\n", timer2.TotalElapsedTime());
 
     // Invoke a function which returns an object.
     Dart_Handle cls = Dart_GetClass(TestCase::lib(), NewString("FieldsTest"));
     Dart_Handle result = Dart_Invoke(cls, NewString("testMain"), 0, NULL);
     if (Dart_IsError(result)) {
       // Print the error.  It is probably an unhandled exception.
       fprintf(stderr, "%s\n", Dart_GetError(result));
     }
     EXPECT_VALID(result);
     Dart_ExitScope();
   }
   Dart_ShutdownIsolate();
-  free(isolate_snapshot_buffer);
+  free(isolate_snapshot_data_buffer);
 }
 
 
 #ifndef PRODUCT
 
 
 UNIT_TEST_CASE(ScriptSnapshot) {
   const char* kLibScriptChars =
       "library dart_import_lib;"
       "class LibFields  {"
@@ skipping 366 matching lines @@
     script_snapshot = reinterpret_cast<uint8_t*>(malloc(size));
     memmove(script_snapshot, buffer, size);
     Dart_ExitScope();
     Dart_ShutdownIsolate();
   }
 
   {
     // Use a script snapshot where a full snapshot is expected.
     char* error = NULL;
     Dart_Isolate isolate = Dart_CreateIsolate(
-        "script-uri", "main", script_snapshot, NULL, NULL, &error);
+        "script-uri", "main", script_snapshot, NULL, NULL, NULL, &error);
     EXPECT(isolate == NULL);
     EXPECT(error != NULL);
-    EXPECT_SUBSTRING("got 'script', expected 'core'", error);
+    EXPECT_SUBSTRING(
+        "Incompatible snapshot kinds:"
+        " vm 'core', isolate 'script'",
+        error);
     free(error);
   }
 
   {
     TestCase::CreateTestIsolateFromSnapshot(full_snapshot);
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Use a full snapshot where a script snapshot is expected.
     Dart_Handle result = Dart_LoadScriptFromSnapshot(full_snapshot, size);
     EXPECT_ERROR(result,
@@ skipping 1322 matching lines @@
   StackZone zone(Thread::Current());
   uint8_t* buffer;
   MessageWriter writer(&buffer, &zone_allocator, &zone_deallocator, true);
   writer.WriteInlinedObjectHeader(kOmittedObjectId);
   // For performance, we'd like single-byte headers when ids are omitted.
   // If this starts failing, consider renumbering the snapshot ids.
   EXPECT_EQ(1, writer.BytesWritten());
 }
 
 }  // namespace dart