Move no_callback_scope_depth_ and cha_ from isolate -> 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/handles.h"
 #include "vm/os_thread.h"
@@ skipping 148 matching lines @@
 
   // The topmost zone used for allocation in this thread.
   Zone* zone() const { return state_.zone; }
 
   // The isolate that this thread is operating on, or NULL if none.
   Isolate* isolate() const { return isolate_; }
   static intptr_t isolate_offset() {
     return OFFSET_OF(Thread, isolate_);
   }
 
-  // The (topmost) CHA for the compilation in the isolate of this thread.
-  // TODO(23153): Move this out of Isolate/Thread.
+  // The (topmost) CHA for the compilation in this thread.
   CHA* cha() const;
   void set_cha(CHA* value);
 
+  int32_t no_callback_scope_depth() const {
+    return no_callback_scope_depth_;
+  }
+
+  void IncrementNoCallbackScopeDepth() {
+    ASSERT(no_callback_scope_depth_ < INT_MAX);
+    no_callback_scope_depth_ += 1;
+  }
+
+  void DecrementNoCallbackScopeDepth() {
+    ASSERT(no_callback_scope_depth_ > 0);
+    no_callback_scope_depth_ -= 1;
+  }
+
   void StoreBufferAddObject(RawObject* obj);
   void StoreBufferAddObjectGC(RawObject* obj);
 #if defined(TESTING)
   bool StoreBufferContains(RawObject* obj) const {
     return store_buffer_block_->Contains(obj);
   }
 #endif
   void StoreBufferBlockProcess(StoreBuffer::ThresholdPolicy policy);
   static intptr_t store_buffer_block_offset() {
     return OFFSET_OF(Thread, store_buffer_block_);
@@ skipping 254 matching lines @@
 
 #if defined(DEBUG)
 #define REUSABLE_HANDLE_SCOPE_VARIABLE(object)                                 \
   bool reusable_##object##_handle_scope_active_;
   REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_SCOPE_VARIABLE);
 #undef REUSABLE_HANDLE_SCOPE_VARIABLE
 #endif  // defined(DEBUG)
 
   VMHandles reusable_handles_;
 
+  CHA* cha_;
+  int32_t no_callback_scope_depth_;
+
   // All |Thread|s are registered in the thread list.
   Thread* thread_list_next_;
 
   static Thread* thread_list_head_;
   static Mutex* thread_list_lock_;
 
   static void AddThreadToList(Thread* thread);
   static void RemoveThreadFromList(Thread* thread);
 
   explicit Thread(bool init_vm_constants = true);
@@ skipping 50 matching lines @@
   // Returns the current thread and moves forward.
   Thread* Next();
 
  private:
   Thread* next_;
 };
 
 }  // namespace dart
 
 #endif  // VM_THREAD_H_