- Get rid of RawClosure class and use RawInstance for closures.

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/symbols.h"
 #include "vm/visitor.h"
@@ skipping 21 matching lines @@
                           intptr_t object_id,
                           intptr_t tags,
                           Snapshot::Kind kind) {
   ASSERT(reader != NULL);
 
   Class& cls = Class::ZoneHandle(reader->isolate(), Class::null());
   if ((kind == Snapshot::kFull) ||
       (kind == Snapshot::kScript && !RawObject::IsCreatedFromSnapshot(tags))) {
     // Read in the base information.
     intptr_t class_id = reader->ReadIntptrValue();
-    bool is_signature_class = reader->Read<bool>();
 
     // Allocate class object of specified kind.
     if (kind == Snapshot::kFull) {
-      cls = reader->NewClass(class_id, is_signature_class);
+      cls = reader->NewClass(class_id);
     } else {
       if (class_id < kNumPredefinedCids) {
         ASSERT((class_id >= kInstanceCid) && (class_id <= kDartFunctionCid));
         cls = reader->isolate()->class_table()->At(class_id);
       } else {
-        if (is_signature_class) {
-          cls = New<Closure>(kIllegalCid);
-        } else {
-          cls = New<Instance>(kIllegalCid);
-        }
+        cls = New<Instance>(kIllegalCid);
       }
     }
     reader->AddBackRef(object_id, &cls, kIsDeserialized);
 
     // Set the object tags.
     cls.set_tags(tags);
 
     // Set all non object fields.
     cls.set_instance_size(reader->ReadIntptrValue());
     cls.set_type_arguments_instance_field_offset(reader->ReadIntptrValue());
@@ skipping 27 matching lines @@
   if ((kind == Snapshot::kFull) ||
       (kind == Snapshot::kScript &&
        !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)))) {
     // Write out the class and tags information.
     writer->WriteVMIsolateObject(kClassCid);
     writer->WriteIntptrValue(writer->GetObjectTags(this));
 
     // Write out all the non object pointer fields.
     // NOTE: cpp_vtable_ is not written.
     writer->WriteIntptrValue(ptr()->id_);
-    writer->Write<bool>(Class::IsSignatureClass(this) ? true : false);
     writer->WriteIntptrValue(ptr()->instance_size_);
     writer->WriteIntptrValue(ptr()->type_arguments_instance_field_offset_);
     writer->WriteIntptrValue(ptr()->next_field_offset_);
     writer->WriteIntptrValue(ptr()->num_native_fields_);
     writer->WriteIntptrValue(ptr()->token_pos_);
     writer->Write<uint8_t>(ptr()->state_bits_);
 
     // Write out all the object pointer fields.
     SnapshotWriterVisitor visitor(writer);
     visitor.VisitPointers(from(), to());
@@ skipping 2084 matching lines @@
 }
 
 
 void RawDartFunction::WriteTo(SnapshotWriter* writer,
                               intptr_t object_id,
                               Snapshot::Kind kind) {
   UNREACHABLE();  // DartFunction is an abstract class.
 }
 
 
-RawClosure* Closure::ReadFrom(SnapshotReader* reader,
-                              intptr_t object_id,
-                              intptr_t tags,
-                              Snapshot::Kind kind) {
-  UNIMPLEMENTED();
-  return Closure::null();
-}
-
-
-void RawClosure::WriteTo(SnapshotWriter* writer,
-                         intptr_t object_id,
-                         Snapshot::Kind kind) {
-  UNIMPLEMENTED();
-}
-
-
 RawStacktrace* Stacktrace::ReadFrom(SnapshotReader* reader,
                                     intptr_t object_id,
                                     intptr_t tags,
                                     Snapshot::Kind kind) {
   UNIMPLEMENTED();
   return Stacktrace::null();
 }
 
 
 void RawStacktrace::WriteTo(SnapshotWriter* writer,
@@ skipping 93 matching lines @@
   // Write out the class and tags information.
   writer->WriteIndexedObject(kWeakPropertyCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out all the other fields.
   writer->Write<RawObject*>(ptr()->key_);
   writer->Write<RawObject*>(ptr()->value_);
 }
 
 }  // namespace dart