- Reapply change r26880.

runtime/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 819 matching lines @@
   RawArray* object_table_;
   RawArray* static_calls_target_table_;  // (code-offset, function, code).
   RawArray* stackmaps_;
   RawLocalVarDescriptors* var_descriptors_;
   RawArray* comments_;
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->comments_);
   }
 
   intptr_t pointer_offsets_length_;
-  // These fields cannot be boolean because of alignment issues on x64
+  // Alive: If true, the embedded object pointers will be visited during GC.
+  // This field cannot be shorter because of alignment issues on x64
   // architectures.
-  intptr_t is_optimized_;
-  // If true, the embedded object pointers will be visited during GC.
-  intptr_t is_alive_;
+  intptr_t state_bits_;  // state, is_optimized, is_alive.
 
   // Variable length data follows here.
   int32_t data_[0];
 
   friend class StackFrame;
 };
 
 
 class RawInstructions : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Instructions);
@@ skipping 81 matching lines @@
 
   VarInfo data_[0];   // Variable info with [length_] entries.
 };
 
 
 class RawExceptionHandlers : public RawObject {
  public:
   // The index into the ExceptionHandlers table corresponds to
   // the try_index of the handler.
   struct HandlerInfo {
-    intptr_t outer_try_index;  // Try block index of enclosing try block.
     intptr_t handler_pc;       // PC value of handler.
-    bool needs_stacktrace;     // True if a stacktrace is needed.
+    int16_t outer_try_index;   // Try block index of enclosing try block.
+    int16_t needs_stacktrace;  // True if a stacktrace is needed.
   };
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExceptionHandlers);
 
   // Number of exception handler entries.
   intptr_t length_;
 
   // Array with [length_] entries. Each entry is an array of all handled
   // exception types.
   RawArray* handled_types_data_;
@@ skipping 753 matching lines @@
   // Make sure this is updated when new TypedData types are added.
   ASSERT(kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 12);
   ASSERT(kExternalTypedDataInt8ArrayCid == kTypedDataInt8ArrayViewCid + 13);
   ASSERT(kNullCid == kExternalTypedDataInt8ArrayCid + 12);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_