Cache number of type arguments in class object instead of recalculating it.

runtime/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 48 matching lines @@
     // Set the object tags.
     cls.set_tags(tags);
 
     // Set all non object fields.
     if (!RawObject::IsInternalVMdefinedClassId(class_id)) {
       // Instance size of a VM defined class is already set up.
       cls.set_instance_size_in_words(reader->ReadIntptrValue());
       cls.set_next_field_offset_in_words(reader->ReadIntptrValue());
     }
     cls.set_type_arguments_field_offset_in_words(reader->ReadIntptrValue());
-    cls.set_num_native_fields(reader->ReadIntptrValue());
+    cls.set_num_type_arguments(reader->Read<int16_t>());
+    cls.set_num_own_type_arguments(reader->Read<int16_t>());
+    cls.set_num_native_fields(reader->Read<uint16_t>());
     cls.set_token_pos(reader->ReadIntptrValue());
     cls.set_state_bits(reader->Read<uint16_t>());
 
     // Set all the object fields.
     // TODO(5411462): Need to assert No GC can happen here, even though
     // allocations may happen.
     intptr_t num_flds = (cls.raw()->to() - cls.raw()->from());
     for (intptr_t i = 0; i <= num_flds; i++) {
       *(cls.raw()->from() + i) = reader->ReadObjectRef();
     }
@@ skipping 24 matching lines @@
     intptr_t class_id = ptr()->id_;
     writer->WriteIntptrValue(class_id);
     if (!RawObject::IsInternalVMdefinedClassId(class_id)) {
       // We don't write the instance size of VM defined classes as they
       // are already setup during initialization as part of pre populating
       // the class table.
       writer->WriteIntptrValue(ptr()->instance_size_in_words_);
       writer->WriteIntptrValue(ptr()->next_field_offset_in_words_);
     }
     writer->WriteIntptrValue(ptr()->type_arguments_field_offset_in_words_);
-    writer->WriteIntptrValue(ptr()->num_native_fields_);
+    writer->Write<int16_t>(ptr()->num_type_arguments_);
+    writer->Write<int16_t>(ptr()->num_own_type_arguments_);
+    writer->Write<uint16_t>(ptr()->num_native_fields_);
     writer->WriteIntptrValue(ptr()->token_pos_);
     writer->Write<uint16_t>(ptr()->state_bits_);
 
     // Write out all the object pointer fields.
     SnapshotWriterVisitor visitor(writer);
     visitor.VisitPointers(from(), to());
   } else {
     writer->WriteClassId(this);
   }
 }
@@ skipping 2522 matching lines @@
 }
 
 
 void RawMirrorReference::WriteTo(SnapshotWriter* writer,
                                  intptr_t object_id,
                                  Snapshot::Kind kind) {
   UNREACHABLE();
 }
 
 }  // namespace dart