Migrate handle scope fields to 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 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)                                              \
   V(RawObject*, object_null_, Object::null(), NULL)                            \
@@ skipping 84 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);
   }
 
+  int32_t no_handle_scope_depth() const {
+#if defined(DEBUG)
+    return state_.no_handle_scope_depth;
+#else
+    return 0;
+#endif
+  }
+
+  void IncrementNoHandleScopeDepth() {
+#if defined(DEBUG)
+    ASSERT(state_.no_handle_scope_depth < INT_MAX);
+    state_.no_handle_scope_depth += 1;
+#endif
+  }
+
+  void DecrementNoHandleScopeDepth() {
+#if defined(DEBUG)
+    ASSERT(state_.no_handle_scope_depth > 0);
+    state_.no_handle_scope_depth -= 1;
+#endif
+  }
+
+  HandleScope* top_handle_scope() const {
+#if defined(DEBUG)
+    return state_.top_handle_scope;
+#else
+    return 0;
+#endif
+  }
+
+  void set_top_handle_scope(HandleScope* handle_scope) {
+#if defined(DEBUG)
+    state_.top_handle_scope = handle_scope;
+#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;
+#if defined(DEBUG)
+    HandleScope* top_handle_scope;
+    intptr_t no_handle_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);                                     \
   }
 CACHED_CONSTANTS_LIST(DEFINE_OFFSET_METHOD)
 #undef DEFINE_OFFSET_METHOD
 
   static bool CanLoadFromThread(const Object& object);
@@ skipping 32 matching lines @@
   void Unschedule();
 
   friend class Isolate;
   friend class StackZone;
   DISALLOW_COPY_AND_ASSIGN(Thread);
 };
 
 }  // namespace dart
 
 #endif  // VM_THREAD_H_