- Change the layout of external typed array objects to avoid the extra indirection when accessing e…

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/symbols.h"
 #include "vm/visitor.h"
@@ skipping 749 matching lines @@
   reader->AddBackRef(object_id, &token_stream, kIsDeserialized);
 
   // Set the object tags.
   token_stream.set_tags(tags);
 
   // Read the stream of tokens into the TokenStream object for script
   // snapshots as we made a copy of token stream.
   if (kind == Snapshot::kScript) {
     NoGCScope no_gc;
     RawExternalUint8Array* stream = token_stream.GetStream();
-    reader->ReadBytes(stream->ptr()->external_data_->data(), len);
+    reader->ReadBytes(stream->ptr()->data_, len);
   }
 
   // Read in the literal/identifier token array.
   *(reader->TokensHandle()) ^= reader->ReadObjectImpl();
   token_stream.SetTokenObjects(*(reader->TokensHandle()));
   // Read in the private key in use by the token stream.
   *(reader->StringHandle()) ^= reader->ReadObjectImpl();
   token_stream.SetPrivateKey(*(reader->StringHandle()));
 
   return token_stream.raw();
@@ skipping 11 matching lines @@
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kTokenStreamCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out the length field and the token stream.
   RawExternalUint8Array* stream = ptr()->stream_;
   intptr_t len = Smi::Value(stream->ptr()->length_);
   writer->Write<RawObject*>(stream->ptr()->length_);
-  writer->WriteBytes(stream->ptr()->external_data_->data(), len);
+  writer->WriteBytes(stream->ptr()->data_, len);
 
   // Write out the literal/identifier token array.
   writer->WriteObjectImpl(ptr()->token_objects_);
   // Write out the private key in use by the token stream.
   writer->WriteObjectImpl(ptr()->private_key_);
 }
 
 
 RawScript* Script::ReadFrom(SnapshotReader* reader,
                             intptr_t object_id,
@@ skipping 1215 matching lines @@
 
 #define EXTERNALARRAY_READ_FROM(name, lname, type)                             \
 RawExternal##name##Array* External##name##Array::ReadFrom(                     \
     SnapshotReader* reader,                                                    \
     intptr_t object_id,                                                        \
     intptr_t tags,                                                             \
     Snapshot::Kind kind) {                                                     \
   ASSERT(kind != Snapshot::kFull);                                             \
   intptr_t length = reader->ReadSmiValue();                                    \
   type* data = reinterpret_cast<type*>(reader->ReadIntptrValue());             \
+  const External##name##Array& obj = External##name##Array::Handle(            \
+      External##name##Array::New(data, length));                               \
   void* peer = reinterpret_cast<void*>(reader->ReadIntptrValue());             \
-  Dart_PeerFinalizer callback =                                                \
-      reinterpret_cast<Dart_PeerFinalizer>(reader->ReadIntptrValue());         \
-  return New(data, length, peer, callback, HEAP_SPACE(kind));                  \
+  Dart_WeakPersistentHandleFinalizer callback =                                \
+      reinterpret_cast<Dart_WeakPersistentHandleFinalizer>(                    \
+          reader->ReadIntptrValue());                                          \
+  obj.AddFinalizer(peer, callback);                                            \
+  return obj.raw();                                                            \
 }                                                                              \
 
 
 BYTEARRAY_TYPE_LIST(EXTERNALARRAY_READ_FROM)
 #undef EXTERNALARRAY_READ_FROM
 
 
 template<typename ElementT>
 static void ByteArrayWriteTo(SnapshotWriter* writer,
                              intptr_t object_id,
@@ skipping 50 matching lines @@
 #define EXTERNALARRAY_WRITE_TO(name, lname, type)                              \
 void RawExternal##name##Array::WriteTo(SnapshotWriter* writer,                 \
                                        intptr_t object_id,                     \
                                        Snapshot::Kind kind) {                  \
   ByteArrayWriteTo(writer,                                                     \
                    object_id,                                                  \
                    kind,                                                       \
                    k##name##ArrayCid,                                          \
                    writer->GetObjectTags(this),                                \
                    ptr()->length_,                                             \
-                   ptr()->external_data_->data());                             \
+                   ptr()->data_);                                              \
 }                                                                              \
 
 
 BYTEARRAY_TYPE_LIST(EXTERNALARRAY_WRITE_TO)
 #undef BYTEARRAY_WRITE_TO
 #undef BYTEARRAY_TYPE_LIST
 
 
 RawDartFunction* DartFunction::ReadFrom(SnapshotReader* reader,
                                         intptr_t object_id,
@@ skipping 117 matching lines @@
   // Write out the class and tags information.
   writer->WriteIndexedObject(kWeakPropertyCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out all the other fields.
   writer->Write<RawObject*>(ptr()->key_);
   writer->Write<RawObject*>(ptr()->value_);
 }
 
 }  // namespace dart