Add Zone-based handle allocation interface and reduce use of Isolate-based interfaces.

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"
 
 namespace dart {
 
 DECLARE_DEBUG_FLAG(bool, trace_handles);
 
 template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
 void Handles<kHandleSizeInWords,
              kHandlesPerChunk,
              kOffsetOfRawPtr>::VisitObjectPointers(
@@ skipping 59 matching lines @@
   }
 
   // Delete all the extra scoped handle blocks allocated and reinit the first
   // scoped block.
   DeleteHandleBlocks(first_scoped_block_.next_block());
   first_scoped_block_.ReInit();
   scoped_blocks_ = &first_scoped_block_;
 }
 
 
-// Figure out the current handle scope using the current Isolate and
+// Figure out the current handle scope using the current Zone and
 // allocate a handle in that scope. The function assumes that a
-// current Isolate, current zone and current handle scope exist. It
-// asserts for this appropriately.
+// current handle scope exists. It asserts for this appropriately.
 template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
 uword Handles<kHandleSizeInWords,
               kHandlesPerChunk,
-              kOffsetOfRawPtr>::AllocateHandle(Isolate* isolate) {
+              kOffsetOfRawPtr>::AllocateHandle(Zone* zone) {
+#if defined(DEBUG)
+  Thread* thread = Thread::Current();
+  ASSERT(thread->zone() == zone);
+  Isolate* isolate = thread->isolate();
   ASSERT(isolate != NULL);
-  ASSERT(isolate->current_zone() != NULL);
   ASSERT(isolate->top_handle_scope() != NULL);
   ASSERT(isolate->no_handle_scope_depth() == 0);
-  Handles* handles = isolate->current_zone()->handles();
+#endif  // DEBUG
+  Handles* handles = zone->handles();
   ASSERT(handles != NULL);
   return handles->AllocateScopedHandle();
 }
 
 
-// Figure out the current zone using the current Isolate and
-// allocate a handle in that zone. The function assumes that a
-// current Isolate and current zone exist. It asserts for
+// 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(Isolate* isolate) {
+              kOffsetOfRawPtr>::AllocateZoneHandle(Zone* zone) {
+#if defined(DEBUG)
+  Thread* thread = Thread::Current();
+  ASSERT(thread->zone() == zone);
+  Isolate* isolate = thread->isolate();
   ASSERT(isolate != NULL);
-  ASSERT(isolate->current_zone() != NULL);
   ASSERT(isolate->no_handle_scope_depth() == 0);
-  Handles* handles = isolate->current_zone()->handles();
+#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.
 template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
 bool Handles<kHandleSizeInWords,
@@ skipping 239 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_