- Pass in the isolate parameter when creating handles.

vm/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/snapshot.h"
 
 #include "vm/assert.h"
 #include "vm/bootstrap.h"
 #include "vm/heap.h"
 #include "vm/object.h"
@@ skipping 49 matching lines @@
   ASSERT((value <= kIntptrMax) && (value >= kIntptrMin));
   return ReadObjectImpl(value);
 }
 
 
 RawClass* SnapshotReader::ReadClassId(intptr_t object_id) {
   ASSERT(kind_ != Snapshot::kFull);
   // Read the class header information and lookup the class.
   intptr_t class_header = ReadIntptrValue();
   ASSERT((class_header & kSmiTagMask) != 0);
-  Class& cls = Class::ZoneHandle();
+  Class& cls = Class::ZoneHandle(isolate(), Class::null());
   cls ^= LookupInternalClass(class_header);
   AddBackwardReference(object_id, &cls);
   if (cls.IsNull()) {
     // Read the library/class information and lookup the class.
-    String& library_url = String::Handle();
+    String& library_url = String::Handle(isolate(), String::null());
     library_url ^= ReadObjectImpl(class_header);
-    String& class_name = String::Handle();
+    String& class_name = String::Handle(isolate(), String::null());
     class_name ^= ReadObject();
     const Library& library =
-        Library::Handle(Library::LookupLibrary(library_url));
+        Library::Handle(isolate(), Library::LookupLibrary(library_url));
     ASSERT(!library.IsNull());
     cls ^= library.LookupClass(class_name);
   }
   ASSERT(!cls.IsNull());
   return cls.raw();
 }
 
 
 void SnapshotReader::AddBackwardReference(intptr_t id, Object* obj) {
   ASSERT((id - kMaxPredefinedObjectIds) == backward_references_.length());
@@ skipping 74 matching lines @@
   intptr_t index = object_id - kMaxPredefinedObjectIds;
   ASSERT(index < backward_references_.length());
   return backward_references_[index]->raw();
 }
 
 
 RawObject* SnapshotReader::ReadInlinedObject(intptr_t object_id) {
   // Read the class header information and lookup the class.
   intptr_t class_header = ReadIntptrValue();
   intptr_t tags = ReadIntptrValue();
-  Class& cls = Class::Handle();
-  Object& obj = Object::Handle();
+  Class& cls = Class::Handle(isolate(), Class::null());
+  Object& obj = Object::Handle(isolate(), Object::null());
   if (SerializedHeaderData::decode(class_header) == kInstanceId) {
     // Object is regular dart instance.
-    Instance& result = Instance::ZoneHandle();
+    Instance& result = Instance::ZoneHandle(isolate(), Instance::null());
     AddBackwardReference(object_id, &result);
 
     cls ^= ReadObject();
     ASSERT(!cls.IsNull());
     intptr_t instance_size = cls.instance_size();
     ASSERT(instance_size > 0);
     // Allocate the instance and read in all the fields for the object.
     RawObject* raw = Object::Allocate(cls, instance_size, Heap::kNew);
     result ^= raw;
     intptr_t offset = Object::InstanceSize();
@@ skipping 255 matching lines @@
 
 
 void SnapshotWriterVisitor::VisitPointers(RawObject** first, RawObject** last) {
   for (RawObject** current = first; current <= last; current++) {
     RawObject* raw_obj = *current;
     writer_->WriteObject(raw_obj);
   }
 }
 
 }  // namespace dart