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

vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 1347 matching lines @@
 
   RawCode* closure_allocation_stub() const {
     return raw_ptr()->closure_allocation_stub_;
   }
   void set_closure_allocation_stub(const Code& value) const;
 
   // Return the closure function implicitly created for this function.
   // If none exists yet, create one and remember it.
   RawFunction* ImplicitClosureFunction() const;
 
-  RawFunction::Kind kind() const { return raw()->GetKind(); }
+  RawFunction::Kind kind() const {
+    return KindBits::decode(raw_ptr()->kind_tag_);
+  }
 
-  bool is_static() const { return raw()->IsStatic(); }
-  bool is_const() const { return raw()->IsConst(); }
-  bool is_external() const { return raw()->IsExternal(); }
+  bool is_static() const { return StaticBit::decode(raw_ptr()->kind_tag_); }
+  bool is_const() const { return ConstBit::decode(raw_ptr()->kind_tag_); }
+  bool is_external() const { return ExternalBit::decode(raw_ptr()->kind_tag_); }
   bool IsConstructor() const {
     return (kind() == RawFunction::kConstructor) && !is_static();
   }
   bool IsFactory() const {
     return (kind() == RawFunction::kConstructor) && is_static();
   }
   bool IsDynamicFunction() const {
     if (is_static() || is_abstract()) {
       return false;
     }
@@ skipping 68 matching lines @@
     raw_ptr()->usage_counter_ = value;
   }
 
   intptr_t deoptimization_counter() const {
     return raw_ptr()->deoptimization_counter_;
   }
   void set_deoptimization_counter(intptr_t value) const {
     raw_ptr()->deoptimization_counter_ = value;
   }
 
-  bool is_optimizable() const { return raw()->IsOptimizable(); }
+  bool is_optimizable() const {
+    return OptimizableBit::decode(raw_ptr()->kind_tag_);
+  }
   void set_is_optimizable(bool value) const;
 
-  bool has_finally() const { return raw()->HasFinally(); }
+  bool has_finally() const {
+    return HasFinallyBit::decode(raw_ptr()->kind_tag_);
+  }
   void set_has_finally(bool value) const;
 
-  bool is_native() const { return raw()->IsNative(); }
+  bool is_native() const { return NativeBit::decode(raw_ptr()->kind_tag_); }
   void set_is_native(bool value) const;
 
-  bool is_abstract() const { return raw()->IsAbstract(); }
+  bool is_abstract() const { return AbstractBit::decode(raw_ptr()->kind_tag_); }
   void set_is_abstract(bool value) const;
 
   bool HasOptimizedCode() const;
 
   intptr_t NumberOfParameters() const;
   intptr_t NumberOfImplicitParameters() const;
 
   // Returns true if the argument counts are valid for calling this function.
   // Otherwise, it returns false and the reason (if error_message is not NULL).
   bool AreValidArgumentCounts(int num_arguments,
@@ skipping 98 matching lines @@
   // The function and the class share the same given name.
   static RawFunction* NewClosureFunction(const String& name,
                                          const Function& parent,
                                          intptr_t token_pos);
 
   static const int kCtorPhaseInit = 1 << 0;
   static const int kCtorPhaseBody = 1 << 1;
   static const int kCtorPhaseAll = (kCtorPhaseInit | kCtorPhaseBody);
 
  private:
+  enum KindTagBits {
+    kStaticBit = 1,
+    kConstBit,
+    kOptimizableBit,
+    kHasFinallyBit,
+    kNativeBit,
+    kAbstractBit,
+    kExternalBit,
+    kKindTagBit,
+    kKindTagSize = 4,
+  };
+  class StaticBit : public BitField<bool, kStaticBit, 1> {};
+  class ConstBit : public BitField<bool, kConstBit, 1> {};
+  class OptimizableBit : public BitField<bool, kOptimizableBit, 1> {};
+  class HasFinallyBit : public BitField<bool, kHasFinallyBit, 1> {};
+  class NativeBit : public BitField<bool, kNativeBit, 1> {};
+  class AbstractBit : public BitField<bool, kAbstractBit, 1> {};
+  class ExternalBit : public BitField<bool, kExternalBit, 1> {};
+  class KindBits :
+    public BitField<RawFunction::Kind, kKindTagBit, kKindTagSize> {}; // NOLINT
+
   void set_name(const String& value) const;
   void set_kind(RawFunction::Kind value) const;
   void set_is_static(bool is_static) const;
   void set_is_const(bool is_const) const;
   void set_is_external(bool value) const;
   void set_parent_function(const Function& value) const;
   void set_owner(const Class& value) const;
   void set_token_pos(intptr_t value) const;
   void set_implicit_closure_function(const Function& value) const;
+  void set_kind_tag(intptr_t value) const;
   static RawFunction* New();
 
   RawString* BuildSignature(bool instantiate,
                             NameVisibility name_visibility,
                             const AbstractTypeArguments& instantiator) const;
 
   // Check the subtype or 'more specific' relationship.
   bool TypeTest(TypeTestKind test_kind,
                 const AbstractTypeArguments& type_arguments,
                 const Function& other,
@@ skipping 3811 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_