- Reapply change r26880.

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 2934 matching lines @@
 
 class Code : public Object {
  public:
   RawInstructions* instructions() const { return raw_ptr()->instructions_; }
   static intptr_t instructions_offset() {
     return OFFSET_OF(RawCode, instructions_);
   }
   intptr_t pointer_offsets_length() const {
     return raw_ptr()->pointer_offsets_length_;
   }
+
   bool is_optimized() const {
-    return (raw_ptr()->is_optimized_ == 1);
+    return OptimizedBit::decode(raw_ptr()->state_bits_);
   }
-  void set_is_optimized(bool value) const {
-    raw_ptr()->is_optimized_ = value ? 1 : 0;
+  void set_is_optimized(bool value) const;
+  bool is_alive() const {
+    return AliveBit::decode(raw_ptr()->state_bits_);
   }
-  bool is_alive() const {
-    return (raw_ptr()->is_alive_ == 1);
-  }
-  void set_is_alive(bool value) const {
-    raw_ptr()->is_alive_ = value ? 1 : 0;
-  }
+  void set_is_alive(bool value) const;
 
   uword EntryPoint() const {
     const Instructions& instr = Instructions::Handle(instructions());
     return instr.EntryPoint();
   }
   intptr_t Size() const {
     const Instructions& instr = Instructions::Handle(instructions());
     return instr.size();
   }
   RawArray* ObjectPool() const {
@@ skipping 151 matching lines @@
   // Each (*node_ids)[n] has a an extracted ic data array (*arrays)[n].
   // Returns the maximum id found.
   intptr_t ExtractIcDataArraysAtCalls(
       GrowableArray<intptr_t>* node_ids,
       const GrowableObjectArray& ic_data_objs) const;
 
   // Returns an array indexed by deopt id, containing the extracted ICData.
   RawArray* ExtractTypeFeedbackArray() const;
 
  private:
+  void set_state_bits(intptr_t bits) const;
+
+  friend class RawCode;
+  enum {
+    kOptimizedBit = 0,
+    kAliveBit = 1,
+  };
+
+  class OptimizedBit : public BitField<bool, kOptimizedBit, 1> {};
+  class AliveBit : public BitField<bool, kAliveBit, 1> {};
+
   // An object finder visitor interface.
   class FindRawCodeVisitor : public FindObjectVisitor {
    public:
     explicit FindRawCodeVisitor(uword pc)
         : FindObjectVisitor(Isolate::Current()), pc_(pc) { }
     virtual ~FindRawCodeVisitor() { }
 
     // Check if object matches find condition.
     virtual bool FindObject(RawObject* obj);
 
@@ skipping 2995 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_