Create temporary handles in the snapshot object during initialization and use them instead of cre...

vm/raw_object_snapshot.cc

 // Copyright (c) 2011, 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 326 matching lines @@
                                           intptr_t object_id,
                                           intptr_t tags,
                                           Snapshot::Kind kind) {
   ASSERT(reader != NULL);
 
   // Read the length so that we can determine instance size to allocate.
   RawSmi* smi_len = GetSmi(reader->ReadIntptrValue());
   intptr_t len = Smi::Value(smi_len);
 
   TypeArguments& type_arguments =
-      TypeArguments::Handle(reader->isolate(), TypeArguments::New(len));
+      TypeArguments::ZoneHandle(reader->isolate(), TypeArguments::New(len));
   reader->AddBackwardReference(object_id, &type_arguments);
 
   // Now set all the object fields.
-  AbstractType& type = AbstractType::Handle(reader->isolate(),
-                                            AbstractType::null());
   for (intptr_t i = 0; i < len; i++) {
-    type ^= reader->ReadObject();
-    type_arguments.SetTypeAt(i, type);
+    *reader->TypeHandle() ^= reader->ReadObject();
+    type_arguments.SetTypeAt(i, *reader->TypeHandle());
   }
 
   // Set the object tags (This is done after setting the object fields
   // because 'SetTypeAt' has an assertion to check if the object is not
   // already canonical).
   type_arguments.set_tags(tags);
 
   // If object needs to be a canonical object, Canonicalize it.
   if ((kind != Snapshot::kFull) && type_arguments.IsCanonical()) {
     type_arguments ^= type_arguments.Canonicalize();
@@ skipping 207 matching lines @@
 
   // Create the token stream object.
   TokenStream& token_stream = TokenStream::ZoneHandle(reader->isolate(),
                                                       TokenStream::New(len));
   reader->AddBackwardReference(object_id, &token_stream);
 
   // Set the object tags.
   token_stream.set_tags(tags);
 
   // Read the token stream into the TokenStream.
-  String& literal = String::Handle(reader->isolate(), String::null());
   for (intptr_t i = 0; i < len; i++) {
     Token::Kind kind = static_cast<Token::Kind>(
         Smi::Value(GetSmi(reader->ReadIntptrValue())));
-    literal ^= reader->ReadObject();
-    token_stream.SetTokenAt(i, kind, literal);
+    *reader->StringHandle() ^= reader->ReadObject();
+    token_stream.SetTokenAt(i, kind, *reader->StringHandle());
   }
   return token_stream.raw();
 }
 
 
 void RawTokenStream::WriteTo(SnapshotWriter* writer,
                              intptr_t object_id,
                              Snapshot::Kind kind) {
   ASSERT(writer != NULL);
   ASSERT(kind != Snapshot::kMessage && !IsCreatedFromSnapshot());
@@ skipping 66 matching lines @@
                               Snapshot::Kind kind) {
   ASSERT(reader != NULL);
   ASSERT(kind != Snapshot::kMessage);
 
   Library& library = Library::ZoneHandle(reader->isolate(), Library::null());
   reader->AddBackwardReference(object_id, &library);
 
   if (RawObject::IsCreatedFromSnapshot(tags)) {
     ASSERT(kind != Snapshot::kFull);
     // Lookup the object as it should already exist in the heap.
-    String& library_url = String::Handle(reader->isolate(), String::null());
-    library_url ^= reader->ReadObject();
-    library = Library::LookupLibrary(library_url);
+    *reader->StringHandle() ^= reader->ReadObject();
+    library = Library::LookupLibrary(*reader->StringHandle());
   } else {
     // Allocate library object.
     library = Library::New();
 
     // Set the object tags.
     library.set_tags(tags);
 
     // Set all non object fields.
     library.raw_ptr()->num_imports_ = reader->ReadIntptrValue();
     library.raw_ptr()->num_imported_into_ = reader->ReadIntptrValue();
@@ skipping 719 matching lines @@
 template <class T>
 static RawObject* ArrayReadFrom(SnapshotReader* reader,
                                 intptr_t object_id,
                                 intptr_t tags,
                                 Snapshot::Kind kind) {
   ASSERT(reader != NULL);
 
   // Read the length so that we can determine instance size to allocate.
   RawSmi* smi_len = GetSmi(reader->ReadIntptrValue());
   intptr_t len = Smi::Value(smi_len);
-  T& result = T::Handle(
+  T& result = T::ZoneHandle(
       reader->isolate(),
       T::New(len, (kind == Snapshot::kFull) ? Heap::kOld : Heap::kNew));
   reader->AddBackwardReference(object_id, &result);
 
   // Set the object tags.
   result.set_tags(tags);
 
   // Setup the object fields.
-  AbstractTypeArguments& type_arguments =
-      AbstractTypeArguments::Handle(reader->isolate(),
-                                    AbstractTypeArguments::null());
-  type_arguments ^= reader->ReadObject();
-  result.SetTypeArguments(type_arguments);
+  *reader->TypeArgumentsHandle() ^= reader->ReadObject();
+  result.SetTypeArguments(*reader->TypeArgumentsHandle());
 
-  Object& obj = Object::Handle(reader->isolate(), Object::null());
   for (intptr_t i = 0; i < len; i++) {
-    obj = reader->ReadObject();
-    result.SetAt(i, obj);
+    *reader->ObjectHandle() = reader->ReadObject();
+    result.SetAt(i, *reader->ObjectHandle());
   }
   return result.raw();
 }
 
 
 RawArray* Array::ReadFrom(SnapshotReader* reader,
                           intptr_t object_id,
                           intptr_t tags,
                           Snapshot::Kind kind) {
   return reinterpret_cast<RawArray*>(
@@ skipping 131 matching lines @@
   JSRegExp& regex = JSRegExp::ZoneHandle(
       reader->isolate(),
       JSRegExp::New(len, (kind == Snapshot::kFull) ? Heap::kOld : Heap::kNew));
   reader->AddBackwardReference(object_id, &regex);
 
   // Set the object tags.
   regex.set_tags(tags);
 
   // Read and Set all the other fields.
   regex.raw_ptr()->num_bracket_expressions_ = GetSmi(reader->ReadIntptrValue());
-  String& pattern = String::Handle(reader->isolate(), String::null());
-  pattern ^= reader->ReadObject();
-  regex.raw_ptr()->pattern_ = pattern.raw();
+  *reader->StringHandle() ^= reader->ReadObject();
+  regex.raw_ptr()->pattern_ = (*reader->StringHandle()).raw();
   regex.raw_ptr()->type_ = reader->ReadIntptrValue();
   regex.raw_ptr()->flags_ = reader->ReadIntptrValue();
 
   // TODO(5411462): Need to implement a way of recompiling the regex.
 
   return regex.raw();
 }
 
 
 void RawJSRegExp::WriteTo(SnapshotWriter* writer,
@@ skipping 14 matching lines @@
   // Write out all the other fields.
   writer->Write<RawObject*>(ptr()->num_bracket_expressions_);
   writer->WriteObject(ptr()->pattern_);
   writer->WriteIntptrValue(ptr()->type_);
   writer->WriteIntptrValue(ptr()->flags_);
 
   // Do not write out the data part which is native.
 }
 
 }  // namespace dart