Migrate handle scope fields to Thread.

runtime/vm/handles_impl.h

 // Copyright (c) 2012, 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_IMPL_H_
 #define VM_HANDLES_IMPL_H_
 
 #include "vm/heap.h"
 #include "vm/thread.h"
 #include "vm/visitor.h"
@@ skipping 78 matching lines @@
 // Figure out the current handle scope using the current Zone and
 // allocate a handle in that scope. The function assumes that a
 // current handle scope exists. It asserts for this appropriately.
 template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
 uword Handles<kHandleSizeInWords,
               kHandlesPerChunk,
               kOffsetOfRawPtr>::AllocateHandle(Zone* zone) {
 #if defined(DEBUG)
   Thread* thread = Thread::Current();
   ASSERT(thread->zone() == zone);
-  Isolate* isolate = thread->isolate();
-  ASSERT(isolate != NULL);
-  ASSERT(isolate->top_handle_scope() != NULL);
-  ASSERT(isolate->no_handle_scope_depth() == 0);
+  ASSERT(thread->top_handle_scope() != NULL);
+  ASSERT(thread->no_handle_scope_depth() == 0);
 #endif  // DEBUG
   Handles* handles = zone->handles();
   ASSERT(handles != NULL);
   return handles->AllocateScopedHandle();
 }
 
 
 // The function assumes that 'zone' is the current zone and asserts for
 // this appropriately.
 template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
 uword Handles<kHandleSizeInWords,
               kHandlesPerChunk,
               kOffsetOfRawPtr>::AllocateZoneHandle(Zone* zone) {
 #if defined(DEBUG)
   Thread* thread = Thread::Current();
   ASSERT(thread->zone() == zone);
-  Isolate* isolate = thread->isolate();
-  ASSERT(isolate != NULL);
-  ASSERT(isolate->no_handle_scope_depth() == 0);
+  ASSERT(thread->no_handle_scope_depth() == 0);
 #endif  // DEBUG
   Handles* handles = zone->handles();
   ASSERT(handles != NULL);
   uword address = handles->AllocateHandleInZone();
   return address;
 }
 
 
 // Figure out the current zone using the current Isolate and
 // check if the specified handle has been allocated in this zone.
@@ skipping 241 matching lines @@
 template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
 int Handles<kHandleSizeInWords,
             kHandlesPerChunk,
             kOffsetOfRawPtr>::HandlesBlock::HandleCount() const {
   return (next_handle_slot_ / kHandleSizeInWords);
 }
 
 }  // namespace dart
 
 #endif  // VM_HANDLES_IMPL_H_