| Index: runtime/vm/raw_object.h
|
| diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h
|
| index 9f4e3bd8642263b2d23f344b8bd77d1fecb65270..c0e367f662c907090fad653c163fe07dc4b7aec1 100644
|
| --- a/runtime/vm/raw_object.h
|
| +++ b/runtime/vm/raw_object.h
|
| @@ -837,10 +837,11 @@ class RawCode : public RawObject {
|
| }
|
|
|
| intptr_t pointer_offsets_length_;
|
| - // Alive: If true, the embedded object pointers will be visited during GC.
|
| - // This field cannot be shorter because of alignment issues on x64
|
| + // These fields cannot be boolean because of alignment issues on x64
|
| // architectures.
|
| - intptr_t state_bits_; // state, is_optimized, is_alive.
|
| + intptr_t is_optimized_;
|
| + // If true, the embedded object pointers will be visited during GC.
|
| + intptr_t is_alive_;
|
|
|
| // Variable length data follows here.
|
| int32_t data_[0];
|
| @@ -942,9 +943,9 @@ class RawExceptionHandlers : public RawObject {
|
| // 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.
|
| - int16_t outer_try_index; // Try block index of enclosing try block.
|
| - int16_t needs_stacktrace; // True if a stacktrace is needed.
|
| + bool needs_stacktrace; // True if a stacktrace is needed.
|
| };
|
| private:
|
| RAW_HEAP_OBJECT_IMPLEMENTATION(ExceptionHandlers);
|
|
|