Migrate handle scope fields to Thread.

runtime/vm/handles.h

 // Copyright (c) 2011, 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_HANDLES_H_
 #define VM_HANDLES_H_
 
 #include "vm/allocation.h"
 #include "vm/flags.h"
 #include "vm/os.h"
@@ skipping 274 matching lines @@
   static int ZoneHandleCount();
 
   friend class ApiZone;
   friend class ApiNativeScope;
 };
 
 
 // The class HandleScope is used to start a new handles scope in the code.
 // It is used as follows:
 // {
-//   HANDLESCOPE(isolate);
+//   HANDLESCOPE(thread);
 //   ....
 //   .....
 //   code that creates some scoped handles.
 //   ....
 // }
 class HandleScope : public StackResource {
  public:
+  explicit HandleScope(Thread* thread);
+  // DEPRECATED: Use Thread version.
   explicit HandleScope(Isolate* isolate);
   ~HandleScope();
 
  private:
+  void Initialize();
+
   VMHandles::HandlesBlock* saved_handle_block_;  // Handle block at prev scope.
   uword saved_handle_slot_;  // Next available handle slot at previous scope.
 #if defined(DEBUG)
   HandleScope* link_;  // Link to previous scope.
 #endif
   DISALLOW_IMPLICIT_CONSTRUCTORS(HandleScope);
 };
 
 // Macro to start a new Handle scope.
-#define HANDLESCOPE(isolate)                                                  \
-    dart::HandleScope vm_internal_handles_scope_(isolate);
+#define HANDLESCOPE(isolate_or_thread)                                         \
+    dart::HandleScope vm_internal_handles_scope_(isolate_or_thread);
 
 
 // The class NoHandleScope is used in critical regions of the virtual machine
 // code where raw dart object pointers are directly manipulated.
 // This class asserts that we do not add code that will allocate new handles
 // during this critical area.
 // It is used as follows:
 // {
-//   NOHANDLESCOPE(isolate);
+//   NOHANDLESCOPE(thread);
 //   ....
 //   .....
 //   critical code that manipulates dart objects directly.
 //   ....
 // }
 #if defined(DEBUG)
 class NoHandleScope : public StackResource {
  public:
+  explicit NoHandleScope(Thread* thread);
+  // DEPRECATED: Use Thread version.
   explicit NoHandleScope(Isolate* isolate);
   NoHandleScope();
   ~NoHandleScope();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoHandleScope);
 };
 #else  // defined(DEBUG)
 class NoHandleScope : public ValueObject {
  public:
+  explicit NoHandleScope(Thread* thread) { }
   explicit NoHandleScope(Isolate* isolate) { }
   NoHandleScope() { }
   ~NoHandleScope() { }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoHandleScope);
 };
 #endif  // defined(DEBUG)
 
 // Macro to start a no handles scope in the code.
-#define NOHANDLESCOPE(isolate)                                                 \
-    dart::NoHandleScope no_vm_internal_handles_scope_(isolate);
+#define NOHANDLESCOPE(isolate_or_thread)                                       \
+    dart::NoHandleScope no_vm_internal_handles_scope_(isolate_or_thread);
 
 }  // namespace dart
 
 #endif  // VM_HANDLES_H_