1. Write out only the kind_tag_ field of a function in the snapshot instead of the individual bits …

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 415 matching lines @@
   // Set the object tags.
   func.set_tags(tags);
 
   // Set all the non object fields.
   func.set_token_pos(reader->ReadIntptrValue());
   func.set_end_token_pos(reader->ReadIntptrValue());
   func.set_num_fixed_parameters(reader->ReadIntptrValue());
   func.set_num_optional_parameters(reader->ReadIntptrValue());
   func.set_usage_counter(reader->ReadIntptrValue());
   func.set_deoptimization_counter(reader->ReadIntptrValue());
-  func.set_kind(static_cast<RawFunction::Kind >(reader->ReadIntptrValue()));
-  func.set_is_static(reader->Read<bool>());
-  func.set_is_const(reader->Read<bool>());
-  func.set_is_optimizable(reader->Read<bool>());
-  func.set_is_native(reader->Read<bool>());
-  func.set_is_abstract(reader->Read<bool>());
+  func.set_kind_tag(reader->ReadIntptrValue());
 
   // Set all the object fields.
   // TODO(5411462): Need to assert No GC can happen here, even though
   // allocations may happen.
   intptr_t num_flds = (func.raw()->to() - func.raw()->from());
   for (intptr_t i = 0; i <= num_flds; i++) {
     *(func.raw()->from() + i) = reader->ReadObjectRef();
   }
 
   return func.raw();
@@ skipping 14 matching lines @@
   writer->WriteVMIsolateObject(kFunctionCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out all the non object fields.
   writer->WriteIntptrValue(ptr()->token_pos_);
   writer->WriteIntptrValue(ptr()->end_token_pos_);
   writer->WriteIntptrValue(ptr()->num_fixed_parameters_);
   writer->WriteIntptrValue(ptr()->num_optional_parameters_);
   writer->WriteIntptrValue(ptr()->usage_counter_);
   writer->WriteIntptrValue(ptr()->deoptimization_counter_);
-  writer->WriteIntptrValue(GetKind());
-  writer->Write<bool>(IsStatic());
-  writer->Write<bool>(IsConst());
-  writer->Write<bool>(IsOptimizable());
-  writer->Write<bool>(IsNative());
-  writer->Write<bool>(IsAbstract());
+  writer->WriteIntptrValue(ptr()->kind_tag_);
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
 RawField* Field::ReadFrom(SnapshotReader* reader,
                           intptr_t object_id,
                           intptr_t tags,
@@ skipping 1526 matching lines @@
   writer->Write<RawObject*>(ptr()->num_bracket_expressions_);
   writer->WriteObjectImpl(ptr()->pattern_);
   writer->WriteIntptrValue(ptr()->type_);
   writer->WriteIntptrValue(ptr()->flags_);
 
   // Do not write out the data part which is native.
 }
 
 
 }  // namespace dart