Use external byte arrays for token stream, this moves the token stream out of the isolate heap. For…

vm/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/snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/exceptions.h"
@@ skipping 138 matching lines @@
     : BaseReader(buffer, size),
       kind_(kind),
       isolate_(isolate),
       cls_(Class::Handle()),
       obj_(Object::Handle()),
       str_(String::Handle()),
       library_(Library::Handle()),
       type_(AbstractType::Handle()),
       type_arguments_(AbstractTypeArguments::Handle()),
       tokens_(Array::Handle()),
+      stream_(TokenStream::Handle()),
+      data_(ExternalUint8Array::Handle()),
       backward_references_((kind == Snapshot::kFull) ?
                            kNumInitialReferencesInFullSnapshot :
                            kNumInitialReferences) {
 }
 
 
 RawObject* SnapshotReader::ReadObject() {
   Object& obj = Object::Handle(ReadObjectImpl());
   for (intptr_t i = 0; i < backward_references_.length(); i++) {
     if (!backward_references_[i]->is_deserialized()) {
@@ skipping 227 matching lines @@
 
 
 RawTypeArguments* SnapshotReader::NewTypeArguments(intptr_t len) {
   ALLOC_NEW_OBJECT_WITH_LEN(TypeArguments,
                             Object::type_arguments_class(),
                             len);
 }
 
 
 RawTokenStream* SnapshotReader::NewTokenStream(intptr_t len) {
-  ALLOC_NEW_OBJECT_WITH_LEN(TokenStream,
-                            Object::token_stream_class(),
-                            len);
+  ASSERT(kind_ == Snapshot::kFull);
+  ASSERT(isolate()->no_gc_scope_depth() != 0);
+  cls_ = Object::token_stream_class();
+  stream_ = reinterpret_cast<RawTokenStream*>(
+      AllocateUninitialized(cls_, TokenStream::InstanceSize()));
+  cls_ = object_store()->external_int8_array_class();
+  uint8_t* array = const_cast<uint8_t*>(CurrentBufferAddress());
+  ASSERT(array != NULL);
+  Advance(len);
+  ExternalByteArrayData<uint8_t>* external_data =
+      new ExternalByteArrayData<uint8_t>(array,
+                                         reinterpret_cast<void*>(array),

[cshapiro, 2012/09/06 00:11:49]

make line 419 a NULL instead of non-NULL

[siva, 2012/09/06 18:19:29]

Done.

+                                         NULL);
+  ASSERT(external_data != NULL);
+  data_ = reinterpret_cast<RawExternalUint8Array*>(
+      AllocateUninitialized(cls_, ExternalUint8Array::InstanceSize()));
+  data_.SetExternalData(external_data);
+  data_.SetLength(len);
+  stream_.SetStream(data_);
+  return stream_.raw();
 }
 
 
 RawContext* SnapshotReader::NewContext(intptr_t num_variables) {
   ASSERT(kind_ == Snapshot::kFull);
   ASSERT(isolate()->no_gc_scope_depth() != 0);
   cls_ = Object::context_class();
   RawContext* obj = reinterpret_cast<RawContext*>(
       AllocateUninitialized(cls_, Context::InstanceSize(num_variables)));
   obj->ptr()->num_variables_ = num_variables;
@@ skipping 734 matching lines @@
 
 
 void MessageWriter::WriteMessage(const Object& obj) {
   ASSERT(kind() == Snapshot::kMessage);
   WriteObject(obj.raw());
   UnmarkAll();
 }
 
 
 }  // namespace dart