- Add a class index to the classes.

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 201 matching lines @@
 
 
 RawClass* SnapshotReader::NewClass(int value) {
   ASSERT(kind_ == Snapshot::kFull);
   ASSERT(isolate()->no_gc_scope_depth() != 0);
   ObjectKind object_kind = static_cast<ObjectKind>(value);
   if ((object_kind == kInstance || object_kind == kClosure)) {
     cls_ = Object::class_class();
     RawClass* obj = reinterpret_cast<RawClass*>(
         AllocateUninitialized(cls_, Class::InstanceSize()));
-    obj->ptr()->instance_kind_ = object_kind;
     if (object_kind == kInstance) {
       Instance fake;
       obj->ptr()->handle_vtable_ = fake.vtable();
     } else {
       Closure fake;
       obj->ptr()->handle_vtable_ = fake.vtable();
     }
-    return obj;
+    const Class& cls = Class::Handle(obj);

[siva, 2012/04/02 18:29:21]

cls_ = obj; 

That way we avoid the creation of a handle.

[Ivan Posva, 2012/04/29 21:08:25]

Done.

+    cls.set_instance_kind(object_kind);
+    cls.set_index(kIllegalObjectKind);
+    isolate()->class_table()->Register(cls);
+    return cls.raw();
   }
   return Class::GetClass(object_kind);
 }
 
 
 RawMint* SnapshotReader::NewMint(int64_t value) {
   ASSERT(kind_ == Snapshot::kFull);
   ASSERT(isolate()->no_gc_scope_depth() != 0);
   cls_ = object_store()->mint_class();
   RawMint* obj = reinterpret_cast<RawMint*>(
@@ skipping 113 matching lines @@
     // Use the preallocated out of memory exception to avoid calling
     // into dart code or allocating any code.
     const Instance& exception =
         Instance::Handle(object_store()->out_of_memory());
     Exceptions::Throw(exception);
     UNREACHABLE();
   }
   RawObject* raw_obj = reinterpret_cast<RawObject*>(address + kHeapObjectTag);
   raw_obj->ptr()->class_ = cls.raw();
   uword tags = 0;
+  intptr_t index = cls.index();
+  ASSERT(index != kIllegalObjectKind);
+  tags = RawObject::ClassTag::update(index, tags);
   tags = RawObject::SizeTag::update(size, tags);
   raw_obj->ptr()->tags_ = tags;
   return raw_obj;
 }
 
 
 RawObject* SnapshotReader::ReadObjectImpl(intptr_t header) {
   SerializedHeaderType header_type = SerializedHeaderTag::decode(header);
   intptr_t header_value = SerializedHeaderData::decode(header);
 
@@ skipping 297 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