Begin migration of InterruptableThreadState into Thread.

runtime/vm/thread.h

 // Copyright (c) 2015, 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_THREAD_H_
 #define VM_THREAD_H_
 
 #include "vm/globals.h"
 #include "vm/os_thread.h"
 #include "vm/store_buffer.h"
 
 namespace dart {
 
 class CHA;
 class HandleScope;
 class Heap;
+class InterruptableThreadState;
 class Isolate;
 class Object;
 class RawBool;
 class RawObject;
 class StackResource;
 class Zone;
 
 
 // List of VM-global objects/addresses cached in each Thread object.
 #define CACHED_VM_OBJECTS_LIST(V)                                              \
@@ skipping 85 matching lines @@
   }
 
   StackResource* top_resource() const { return state_.top_resource; }
   void set_top_resource(StackResource* value) {
     state_.top_resource = value;
   }
   static intptr_t top_resource_offset() {
     return OFFSET_OF(Thread, state_) + OFFSET_OF(State, top_resource);
   }
 
+  void set_thread_state(InterruptableThreadState* state) {
+    ASSERT((thread_state() == NULL) || (state == NULL));
+    state_.thread_state = state;
+  }
+
+  InterruptableThreadState* thread_state() const {
+    return state_.thread_state;
+  }
+
   static intptr_t heap_offset() {
     return OFFSET_OF(Thread, heap_);
   }
 
   int32_t no_handle_scope_depth() const {
 #if defined(DEBUG)
     return state_.no_handle_scope_depth;
 #else
     return 0;
 #endif
@@ skipping 48 matching lines @@
     state_.no_safepoint_scope_depth -= 1;
 #endif
   }
 
   // Collection of isolate-specific state of a thread that is saved/restored
   // on isolate exit/re-entry.
   struct State {
     Zone* zone;
     uword top_exit_frame_info;
     StackResource* top_resource;
+    // TODO(koda): Migrate individual fields of InterruptableThreadState.
+    InterruptableThreadState* thread_state;
 #if defined(DEBUG)
     HandleScope* top_handle_scope;
     intptr_t no_handle_scope_depth;
     int32_t no_safepoint_scope_depth;
 #endif
   };
 
 #define DEFINE_OFFSET_METHOD(type_name, member_name, expr, default_init_value) \
   static intptr_t member_name##offset() {                                      \
     return OFFSET_OF(Thread, member_name);                                     \
@@ skipping 39 matching lines @@
 
   friend class ApiZone;
   friend class Isolate;
   friend class StackZone;
   DISALLOW_COPY_AND_ASSIGN(Thread);
 };
 
 }  // namespace dart
 
 #endif  // VM_THREAD_H_