Simplify canonicalization of constants and types.

runtime/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 21 matching lines @@
     // Read in the base information.
     ObjectKind kind = reader->Read<ObjectKind>();
 
     // Allocate class object of specified kind.
     cls = Class::GetClass(kind);
     reader->AddBackwardReference(object_id, &cls);
 
     // Set all non object fields.
     cls.set_instance_size(reader->Read<intptr_t>());
     cls.set_type_arguments_instance_field_offset(reader->Read<intptr_t>());
-    cls.set_num_constants(reader->Read<intptr_t>());
-    cls.set_num_canonical_types(reader->Read<intptr_t>());
     cls.set_next_field_offset(reader->Read<intptr_t>());
     cls.set_num_native_fields(reader->Read<intptr_t>());
     cls.set_class_state(reader->Read<int8_t>());
     if (reader->Read<bool>()) {
       cls.set_is_const();
     }
     if (reader->Read<bool>()) {
       cls.set_is_interface();
     }
 
@@ skipping 22 matching lines @@
 
   if (serialize_classes) {
     // Write out the class information.
     writer->WriteObjectHeader(kObjectId, Object::kClassClass);
 
     // Write out all the non object pointer fields.
     // NOTE: cpp_vtable_ is not written.
     writer->Write<ObjectKind>(ptr()->instance_kind_);
     writer->Write<intptr_t>(ptr()->instance_size_);
     writer->Write<intptr_t>(ptr()->type_arguments_instance_field_offset_);
-    writer->Write<intptr_t>(ptr()->num_constants_);
-    writer->Write<intptr_t>(ptr()->num_canonical_types_);
     writer->Write<intptr_t>(ptr()->next_field_offset_);
     writer->Write<intptr_t>(ptr()->num_native_fields_);
     writer->Write<int8_t>(ptr()->class_state_);
     writer->Write<bool>(ptr()->is_const_);
     writer->Write<bool>(ptr()->is_interface_);
 
     // Write out all the object pointer fields.
     visitor.VisitPointers(from(), to());
   } else {
     writer->WriteClassId(this);
@@ skipping 1226 matching lines @@
   // Write out all the other fields.
   writer->Write<RawObject*>(ptr()->num_bracket_expressions_);
   writer->WriteObject(ptr()->pattern_);
   writer->Write<intptr_t>(ptr()->type_);
   writer->Write<intptr_t>(ptr()->flags_);
 
   // Do not write out the data part which is native.
 }
 
 }  // namespace dart