Rearrange bits in the bitfields to get better compaction, this reduces

runtime/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 1015 matching lines @@
   enum {
     kAny = 0,
     kStatic,
     kInstance,
     kConstructor,
     kFactory,
   };
   enum {
     kConstBit = 0,
     kImplementedBit = 1,
-    kAbstractBit = 2,
-    kPatchBit = 3,
-    kSynthesizedClassBit = 4,
-    kTypeFinalizedBit = 5,
-    kClassFinalizedBits = 6,
+    kTypeFinalizedBit = 2,
+    kClassFinalizedBits = 3,
     kClassFinalizedSize = 2,
+    kAbstractBit = 5,
+    kPatchBit = 6,
+    kSynthesizedClassBit = 7,
     kMarkedForParsingBit = 8,
     kMixinTypedefBit = 9,
     kMixinTypeAppliedBit = 10,
   };
   class ConstBit : public BitField<bool, kConstBit, 1> {};
   class ImplementedBit : public BitField<bool, kImplementedBit, 1> {};
+  class TypeFinalizedBit : public BitField<bool, kTypeFinalizedBit, 1> {};
+  class ClassFinalizedBits : public BitField<RawClass::ClassFinalizedState,
+      kClassFinalizedBits, kClassFinalizedSize> {};  // NOLINT
   class AbstractBit : public BitField<bool, kAbstractBit, 1> {};
   class PatchBit : public BitField<bool, kPatchBit, 1> {};
   class SynthesizedClassBit : public BitField<bool, kSynthesizedClassBit, 1> {};
-  class TypeFinalizedBit : public BitField<bool, kTypeFinalizedBit, 1> {};
-  class ClassFinalizedBits : public BitField<RawClass::ClassFinalizedState,
-      kClassFinalizedBits, kClassFinalizedSize> {};  // NOLINT
   class MarkedForParsingBit : public BitField<bool, kMarkedForParsingBit, 1> {};
   class MixinTypedefBit : public BitField<bool, kMixinTypedefBit, 1> {};
   class MixinTypeAppliedBit : public BitField<bool, kMixinTypeAppliedBit, 1> {};
 
   void set_name(const String& value) const;
   void set_signature_function(const Function& value) const;
   void set_signature_type(const AbstractType& value) const;
   void set_state_bits(intptr_t bits) const;
 
   void set_constants(const Array& value) const;
@@ skipping 794 matching lines @@
 
   // Return false and report an error if the fingerprint does not match.
   bool CheckSourceFingerprint(int32_t fp) const;
 
   static const int kCtorPhaseInit = 1 << 0;
   static const int kCtorPhaseBody = 1 << 1;
   static const int kCtorPhaseAll = (kCtorPhaseInit | kCtorPhaseBody);
 
  private:
   enum KindTagBits {
-    kStaticBit = 0,
-    kConstBit = 1,
-    kOptimizableBit = 2,
-    kInlinableBit = 3,
-    kHasFinallyBit = 4,
-    kNativeBit = 5,
+    kKindTagBit = 0,
+    kKindTagSize = 4,
+    kStaticBit = 4,
+    kConstBit = 5,
     kAbstractBit = 6,
-    kExternalBit = 7,
-    kVisibleBit = 8,
-    kIntrinsicBit = 9,
-    kRecognizedBit = 10,
-    kRedirectingBit = 11,
-    kKindTagBit = 12,
-    kKindTagSize = 4,
+    kVisibleBit = 7,
+    kOptimizableBit = 8,
+    kInlinableBit = 9,
+    kIntrinsicBit = 10,
+    kRecognizedBit = 11,
+    kHasFinallyBit = 12,
+    kNativeBit = 13,
+    kRedirectingBit = 14,
+    kExternalBit = 15,
   };
+  class KindBits :
+    public BitField<RawFunction::Kind, kKindTagBit, kKindTagSize> {};  // NOLINT
   class StaticBit : public BitField<bool, kStaticBit, 1> {};
   class ConstBit : public BitField<bool, kConstBit, 1> {};
+  class AbstractBit : public BitField<bool, kAbstractBit, 1> {};
+  class VisibleBit : public BitField<bool, kVisibleBit, 1> {};
   class OptimizableBit : public BitField<bool, kOptimizableBit, 1> {};
   class InlinableBit : public BitField<bool, kInlinableBit, 1> {};
+  class IntrinsicBit : public BitField<bool, kIntrinsicBit, 1> {};
+  class RecognizedBit : public BitField<bool, kRecognizedBit, 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 VisibleBit : public BitField<bool, kVisibleBit, 1> {};
-  class IntrinsicBit : public BitField<bool, kIntrinsicBit, 1> {};
-  class RecognizedBit : public BitField<bool, kRecognizedBit, 1> {};
   class RedirectingBit : public BitField<bool, kRedirectingBit, 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 value) const;
   void set_is_const(bool value) const;
   void set_is_external(bool value) const;
   void set_parent_function(const Function& value) const;
   void set_owner(const Object& value) const;
   RawFunction* implicit_closure_function() const;
   void set_implicit_closure_function(const Function& value) const;
@@ skipping 4365 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_