Removes open arrays (e.g. data[0]) from raw objects.

runtime/vm/raw_object_snapshot.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/bigint_operations.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/snapshot.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
@@ skipping 492 matching lines @@
   writer->Write<RawObject*>(ptr()->length_);
 
   // Write out the instantiations field, but only in a full snapshot.
   if (kind == Snapshot::kFull) {
     writer->WriteObjectImpl(ptr()->instantiations_);
   }
 
   // Write out the individual types.
   intptr_t len = Smi::Value(ptr()->length_);
   for (intptr_t i = 0; i < len; i++) {
-    writer->WriteObjectImpl(ptr()->types_[i]);
+    writer->WriteObjectImpl(ptr()->types()[i]);
   }
 }
 
 
 RawPatchClass* PatchClass::ReadFrom(SnapshotReader* reader,
                                     intptr_t object_id,
                                     intptr_t tags,
                                     Snapshot::Kind kind) {
   ASSERT(reader != NULL);
   ASSERT(((kind == Snapshot::kScript) &&
@@ skipping 174 matching lines @@
   func.set_num_fixed_parameters(reader->Read<int16_t>());
   func.set_num_optional_parameters(reader->Read<int16_t>());
   func.set_deoptimization_counter(reader->Read<int16_t>());
   func.set_kind_tag(reader->Read<uint16_t>());
   func.set_optimized_instruction_count(reader->Read<uint16_t>());
   func.set_optimized_call_site_count(reader->Read<uint16_t>());
 
   // Set all the object fields.
   // TODO(5411462): Need to assert No GC can happen here, even though
   // allocations may happen.
-  intptr_t num_flds = (func.raw()->to() - func.raw()->from());
+  intptr_t num_flds = (func.raw()->to_snapshot() - func.raw()->from());
   for (intptr_t i = 0; i <= num_flds; i++) {
     *(func.raw()->from() + i) = reader->ReadObjectRef();
   }
 
-  // Set up code pointer with the lazy-compile-stub.
-  func.SetInstructions(Code::Handle(StubCode::LazyCompile_entry()->code()));
+  // Initialize all fields that are not part of the snapshot.
+  func.ClearCode();
 
   return func.raw();
 }
 
 
 void RawFunction::WriteTo(SnapshotWriter* writer,
                           intptr_t object_id,
                           Snapshot::Kind kind) {
   ASSERT(writer != NULL);
   ASSERT(((kind == Snapshot::kScript) &&
@@ skipping 13 matching lines @@
   writer->Write<int32_t>(ptr()->usage_counter_);
   writer->Write<int16_t>(ptr()->num_fixed_parameters_);
   writer->Write<int16_t>(ptr()->num_optional_parameters_);
   writer->Write<int16_t>(ptr()->deoptimization_counter_);
   writer->Write<uint16_t>(ptr()->kind_tag_);
   writer->Write<uint16_t>(ptr()->optimized_instruction_count_);
   writer->Write<uint16_t>(ptr()->optimized_call_site_count_);
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
-  visitor.VisitPointers(from(), to_no_code());
-
-  // Write null for the instructions and unoptimized code.
-  writer->WriteVMIsolateObject(kNullObject);
-  writer->WriteVMIsolateObject(kNullObject);
+  visitor.VisitPointers(from(), to_snapshot());
 }
 
 
 RawField* Field::ReadFrom(SnapshotReader* reader,
                           intptr_t object_id,
                           intptr_t tags,
                           Snapshot::Kind kind) {
   ASSERT(reader != NULL);
   ASSERT(((kind == Snapshot::kScript) &&
           !RawObject::IsCreatedFromSnapshot(tags)) ||
@@ skipping 1211 matching lines @@
 void RawOneByteString::WriteTo(SnapshotWriter* writer,
                                intptr_t object_id,
                                Snapshot::Kind kind) {
   StringWriteTo(writer,
                 object_id,
                 kind,
                 kOneByteStringCid,
                 writer->GetObjectTags(this),
                 ptr()->length_,
                 ptr()->hash_,
-                ptr()->data_);
+                ptr()->data());
 }
 
 
 void RawTwoByteString::WriteTo(SnapshotWriter* writer,
                                intptr_t object_id,
                                Snapshot::Kind kind) {
   StringWriteTo(writer,
                 object_id,
                 kind,
                 kTwoByteStringCid,
                 writer->GetObjectTags(this),
                 ptr()->length_,
                 ptr()->hash_,
-                ptr()->data_);
+                ptr()->data());
 }
 
 
 RawExternalOneByteString* ExternalOneByteString::ReadFrom(
     SnapshotReader* reader,
     intptr_t object_id,
     intptr_t tags,
     Snapshot::Kind kind) {
   UNREACHABLE();
   return ExternalOneByteString::null();
@@ skipping 379 matching lines @@
   Dart_WeakPersistentHandleFinalizer callback =
       reinterpret_cast<Dart_WeakPersistentHandleFinalizer>(
           reader->ReadRawPointerValue());
   obj.AddFinalizer(peer, callback);
   return obj.raw();
 }
 
 
 #define TYPED_DATA_WRITE(type)                                                 \
   {                                                                            \
-    type* data = reinterpret_cast<type*>(ptr()->data_);                        \
+    type* data = reinterpret_cast<type*>(ptr()->data());                       \
     for (intptr_t i = 0; i < len; i++) {                                       \
       writer->Write(data[i]);                                                  \
     }                                                                          \
   }                                                                            \
 
 
 void RawTypedData::WriteTo(SnapshotWriter* writer,
                            intptr_t object_id,
                            Snapshot::Kind kind) {
   ASSERT(writer != NULL);
   intptr_t tags = writer->GetObjectTags(this);
   intptr_t cid = ClassIdTag::decode(tags);
   intptr_t len = Smi::Value(ptr()->length_);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(cid);
   writer->WriteIntptrValue(tags);
 
   // Write out the length field.
   writer->Write<RawObject*>(ptr()->length_);
 
   // Write out the array elements.
   switch (cid) {
     case kTypedDataInt8ArrayCid:
     case kTypedDataUint8ArrayCid:
     case kTypedDataUint8ClampedArrayCid: {
-      uint8_t* data = reinterpret_cast<uint8_t*>(ptr()->data_);
+      uint8_t* data = reinterpret_cast<uint8_t*>(ptr()->data());
       writer->WriteBytes(data, len);
       break;
     }
     case kTypedDataInt16ArrayCid:
       TYPED_DATA_WRITE(int16_t);
       break;
     case kTypedDataUint16ArrayCid:
       TYPED_DATA_WRITE(uint16_t);
       break;
     case kTypedDataInt32ArrayCid:
@@ skipping 13 matching lines @@
       break;
     case kTypedDataFloat64ArrayCid:
       TYPED_DATA_WRITE(double);  // NOLINT.
       break;
     default:
       UNREACHABLE();
   }
 }
 
 
+#define TYPED_EXT_DATA_WRITE(type)                                             \
+  {                                                                            \
+    type* data = reinterpret_cast<type*>(ptr()->data_);                        \
+    for (intptr_t i = 0; i < len; i++) {                                       \
+      writer->Write(data[i]);                                                  \
+    }                                                                          \
+  }                                                                            \
+
+
 #define EXT_TYPED_DATA_WRITE(cid, type)                                        \
   writer->WriteIndexedObject(cid);                                             \
   writer->WriteIntptrValue(RawObject::ClassIdTag::update(cid, tags));          \
   writer->Write<RawObject*>(ptr()->length_);                                   \
-  TYPED_DATA_WRITE(type)                                                       \
+  TYPED_EXT_DATA_WRITE(type)                                                   \
 
 
 void RawExternalTypedData::WriteTo(SnapshotWriter* writer,
                                    intptr_t object_id,
                                    Snapshot::Kind kind) {
   ASSERT(writer != NULL);
   intptr_t tags = writer->GetObjectTags(this);
   intptr_t cid = ClassIdTag::decode(tags);
   intptr_t len = Smi::Value(ptr()->length_);
 
@@ skipping 306 matching lines @@
     // We do not allow objects with native fields in an isolate message.
     writer->SetWriteException(Exceptions::kArgument,
                               "Illegal argument in isolate message"
                               " : (object is a UserTag)");
   } else {
     UNREACHABLE();
   }
 }
 
 }  // namespace dart