Use clustered serialization for full snapshots.

runtime/vm/stub_code.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 "vm/stub_code.h"
 
 #include "platform/assert.h"
 #include "platform/globals.h"
 #include "vm/assembler.h"
 #include "vm/disassembler.h"
 #include "vm/flags.h"
 #include "vm/object_store.h"
 #include "vm/safepoint.h"
 #include "vm/snapshot.h"
 #include "vm/virtual_memory.h"
 #include "vm/visitor.h"
+#include "vm/clustered_snapshot.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, disassemble_stubs, false, "Disassemble generated stubs.");
 
 #define STUB_CODE_DECLARE(name)                                                \
   StubEntry* StubCode::name##_entry_ = NULL;
 VM_STUB_CODE_LIST(STUB_CODE_DECLARE);
 #undef STUB_CODE_DECLARE
 
@@ skipping 25 matching lines @@
   VM_STUB_CODE_LIST(STUB_CODE_GENERATE);
 #else
   UNREACHABLE();
 #endif  // DART_PRECOMPILED_RUNTIME
 }
 
 
 #undef STUB_CODE_GENERATE
 
 
-void StubCode::ReadFrom(SnapshotReader* reader) {
-#define READ_STUB(name)                                                        \
-  *(reader->CodeHandle()) ^= reader->ReadObject();                             \
-  name##_entry_ = new StubEntry(*(reader->CodeHandle()));
-  VM_STUB_CODE_LIST(READ_STUB);
-#undef READ_STUB
-}
-
-void StubCode::WriteTo(SnapshotWriter* writer) {
-  // TODO(rmacnak): Consider writing only the instructions to avoid
-  // vm_isolate_is_symbolic.
+void StubCode::Push(Serializer* serializer) {
 #define WRITE_STUB(name)                                                       \
-  writer->WriteObject(StubCode::name##_entry()->code());
+  serializer->Push(StubCode::name##_entry()->code());
   VM_STUB_CODE_LIST(WRITE_STUB);
 #undef WRITE_STUB
 }
 
 
+void StubCode::WriteRef(Serializer* serializer) {
+#define WRITE_STUB(name)                                                       \
+  serializer->WriteRef(StubCode::name##_entry()->code());
+  VM_STUB_CODE_LIST(WRITE_STUB);
+#undef WRITE_STUB
+}
+
+
+void StubCode::ReadRef(Deserializer* deserializer) {
+  Code& code = Code::Handle();
+#define READ_STUB(name)                                                        \
+  code ^= deserializer->ReadRef();                                             \
+  name##_entry_ = new StubEntry(code);
+  VM_STUB_CODE_LIST(READ_STUB);
+#undef READ_STUB
+}
+
+
+
 void StubCode::Init(Isolate* isolate) { }
 
 
 void StubCode::VisitObjectPointers(ObjectPointerVisitor* visitor) {
 }
 
 
 bool StubCode::HasBeenInitialized() {
 #if !defined(TARGET_ARCH_DBC)
   // Use JumpToExceptionHandler and InvokeDart as canaries.
@@ skipping 147 matching lines @@
   if ((name##_entry() != NULL) &&                                              \
       (entry_point == name##_entry()->EntryPoint())) {                         \
     return ""#name;                                                            \
   }
   VM_STUB_CODE_LIST(VM_STUB_CODE_TESTER);
 #undef VM_STUB_CODE_TESTER
   return NULL;
 }
 
 }  // namespace dart