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

vm/raw_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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 540 matching lines @@
     kSetterFunction,     // represents setter functions e.g: set foo(..) { .. }.
     kConstructor,
     kImplicitGetter,     // represents an implicit getter for fields.
     kImplicitSetter,     // represents an implicit setter for fields.
     kConstImplicitGetter,  // represents an implicit const getter for fields.
   };
 
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(Function);
 
-  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<Kind, kKindTagBit, kKindTagSize> {};
-
-  bool IsStatic() const {
-    return StaticBit::decode(ptr()->kind_tag_);
-  }
-  void SetIsStatic(bool value) {
-    uword bits = ptr()->kind_tag_;
-    ptr()->kind_tag_ = StaticBit::update(value, bits);
-  }
-  bool IsConst() const {
-    return ConstBit::decode(ptr()->kind_tag_);
-  }
-  void SetIsConst(bool value) {
-    uword bits = ptr()->kind_tag_;
-    ptr()->kind_tag_ = ConstBit::update(value, bits);
-  }
-  bool IsOptimizable() const {
-    return OptimizableBit::decode(ptr()->kind_tag_);
-  }
-  void SetIsOptimizable(bool value) {
-    uword bits = ptr()->kind_tag_;
-    ptr()->kind_tag_ = OptimizableBit::update(value, bits);
-  }
-  bool HasFinally() const {
-    return HasFinallyBit::decode(ptr()->kind_tag_);
-  }
-  void SetHasFinally(bool value) {
-    uword bits = ptr()->kind_tag_;
-    ptr()->kind_tag_ = HasFinallyBit::update(value, bits);
-  }
-  bool IsNative() const {
-    return NativeBit::decode(ptr()->kind_tag_);
-  }
-  void SetIsNative(bool value) {
-    uword bits = ptr()->kind_tag_;
-    ptr()->kind_tag_ = NativeBit::update(value, bits);
-  }
-  bool IsAbstract() const {
-    return AbstractBit::decode(ptr()->kind_tag_);
-  }
-  void SetIsAbstract(bool value) {
-    uword bits = ptr()->kind_tag_;
-    ptr()->kind_tag_ = AbstractBit::update(value, bits);
-  }
-  bool IsExternal() const {
-    return ExternalBit::decode(ptr()->kind_tag_);
-  }
-  void SetIsExternal(bool value) {
-    uword bits = ptr()->kind_tag_;
-    ptr()->kind_tag_ = ExternalBit::update(value, bits);
-  }
-  Kind GetKind() const {
-    return KindBits::decode(ptr()->kind_tag_);
-  }
-  void SetKind(Kind value) {
-    uword bits = ptr()->kind_tag_;
-    ptr()->kind_tag_ = KindBits::update(value, bits);
-  }
-
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); }
   RawString* name_;
   RawClass* owner_;
   RawAbstractType* result_type_;
   RawArray* parameter_types_;
   RawArray* parameter_names_;
   RawCode* code_;  // Compiled code for the function.
   RawCode* unoptimized_code_;  // Unoptimized code, keep it after optimization.
   RawContextScope* context_scope_;
   RawFunction* parent_function_;  // Enclosing function of this local function.
@@ skipping 962 matching lines @@
          kExternalUint64ArrayCid == kByteArrayCid + 18 &&
          kExternalFloat32ArrayCid == kByteArrayCid + 19 &&
          kExternalFloat64ArrayCid == kByteArrayCid + 20 &&
          kStacktraceCid == kByteArrayCid + 21);
   return (index >= kByteArrayCid && index <= kExternalFloat64ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_