| Index: runtime/vm/thread.h
|
| diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h
|
| index 44b804013e7b6ec3c85ff4c0d8ef290d7ac88ca5..62e540a2d6993e0c7fe016a7656b64d791b68726 100644
|
| --- a/runtime/vm/thread.h
|
| +++ b/runtime/vm/thread.h
|
| @@ -124,11 +124,11 @@ class Thread {
|
|
|
| void set_thread_state(InterruptableThreadState* state) {
|
| ASSERT((thread_state() == NULL) || (state == NULL));
|
| - state_.thread_state = state;
|
| + thread_state_ = state;
|
| }
|
|
|
| InterruptableThreadState* thread_state() const {
|
| - return state_.thread_state;
|
| + return thread_state_;
|
| }
|
|
|
| static intptr_t heap_offset() {
|
| @@ -200,8 +200,6 @@ class Thread {
|
| uword top_exit_frame_info;
|
| StackResource* top_resource;
|
| TimelineEventBlock* timeline_block;
|
| - // TODO(koda): Migrate individual fields of InterruptableThreadState.
|
| - InterruptableThreadState* thread_state;
|
| LongJumpScope* long_jump_base;
|
| #if defined(DEBUG)
|
| HandleScope* top_handle_scope;
|
| @@ -240,6 +238,8 @@ CACHED_CONSTANTS_LIST(DEFINE_OFFSET_METHOD)
|
| Heap* heap_;
|
| State state_;
|
| StoreBufferBlock* store_buffer_block_;
|
| + // TODO(koda): Migrate individual fields of InterruptableThreadState.
|
| + InterruptableThreadState* thread_state_;
|
| #define DECLARE_MEMBERS(type_name, member_name, expr, default_init_value) \
|
| type_name member_name;
|
| CACHED_CONSTANTS_LIST(DECLARE_MEMBERS)
|
|
|