Represent tokens as a compressed stream instead of an array.

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/visitor.h"
 
@@ skipping 575 matching lines @@
 
 
 RawTokenStream* TokenStream::ReadFrom(SnapshotReader* reader,
                                       intptr_t object_id,
                                       intptr_t tags,
                                       Snapshot::Kind kind) {
   ASSERT(reader != NULL);
   ASSERT(kind != Snapshot::kMessage && !RawObject::IsCreatedFromSnapshot(tags));
 
   // Read the length so that we can determine number of tokens to read.
-  intptr_t len = reader->ReadSmiValue();
+  intptr_t len = reader->ReadIntptrValue();
 
   // Create the token stream object.
   TokenStream& token_stream = TokenStream::ZoneHandle(
       reader->isolate(), NEW_OBJECT_WITH_LEN(TokenStream, len));
   reader->AddBackRef(object_id, &token_stream, kIsDeserialized);
 
   // Set the object tags.
   token_stream.set_tags(tags);
 
-  // Read the token stream into the TokenStream.
-  for (intptr_t i = 0; i < len; i++) {
-    *reader->ObjectHandle() = reader->ReadObjectImpl();
-    token_stream.SetTokenAt(i, *reader->ObjectHandle());
-  }
+  // Read the stream of tokens into the TokenStream object.
+  reader->ReadBytes(reinterpret_cast<uint8_t*>(token_stream.EntryAddr(0)), len);
+
+  // Read in the literal/identifier token array.
+  *(reader->TokensHandle()) ^= reader->ReadObjectImpl();
+  token_stream.SetTokenObjects(*(reader->TokensHandle()));
+
   return token_stream.raw();
 }
 
 
 void RawTokenStream::WriteTo(SnapshotWriter* writer,
                              intptr_t object_id,
                              Snapshot::Kind kind) {
   ASSERT(writer != NULL);
   ASSERT(kind != Snapshot::kMessage &&
          !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)));
 
   // Write out the serialization header value for this object.
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
   writer->WriteObjectHeader(Object::kTokenStreamClass,
                             writer->GetObjectTags(this));
 
-  // Write out the length field.
-  writer->Write<RawObject*>(ptr()->length_);
+  // Write out the length field and the token stream.
+  intptr_t len = ptr()->length_;
+  writer->Write<intptr_t>(len);
+  writer->WriteBytes(reinterpret_cast<uint8_t*>(ptr()->data_), len);
 
-  // Write out the token stream (token kind and literal).
-  intptr_t len = Smi::Value(ptr()->length_);
-  for (intptr_t i = 0; i < TokenStream::StreamLength(len); i++) {
-    writer->WriteObjectImpl(ptr()->data_[i]);
-  }
+  // Write out the literal/identifier token array.
+  writer->WriteObjectImpl(ptr()->token_objects_);
 }
 
 
 RawScript* Script::ReadFrom(SnapshotReader* reader,
                             intptr_t object_id,
                             intptr_t tags,
                             Snapshot::Kind kind) {
   ASSERT(reader != NULL);
   ASSERT(kind != Snapshot::kMessage && !RawObject::IsCreatedFromSnapshot(tags));
 
@@ skipping 1334 matching lines @@
   writer->Write<RawObject*>(ptr()->num_bracket_expressions_);
   writer->WriteObjectImpl(ptr()->pattern_);
   writer->WriteIntptrValue(ptr()->type_);
   writer->WriteIntptrValue(ptr()->flags_);
 
   // Do not write out the data part which is native.
 }
 
 
 }  // namespace dart