Changed StackZone and ApiZone to be containers for Zone.

runtime/vm/dart_api_state.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_DART_API_STATE_H_
 #define VM_DART_API_STATE_H_
 
 #include "include/dart_api.h"
 
 #include "platform/thread.h"
@@ skipping 10 matching lines @@
 
 namespace dart {
 
 // Implementation of Zone support for very fast allocation of small chunks
 // of memory. The chunks cannot be deallocated individually, but instead
 // zones support deallocating all chunks in one fast operation when the
 // scope is exited.
 class ApiZone {
  public:
   // Create an empty zone.
-  ApiZone() : zone_() { }
+  ApiZone() : zone_() {
+    Isolate* isolate = Isolate::Current();
+    Zone* current_zone = isolate != NULL ? isolate->current_zone() : NULL;
+    zone_.Link(current_zone);
+    if (isolate != NULL) {
+      isolate->set_current_zone(&zone_);
+    }
+  }
 
   // Delete all memory associated with the zone.
-  ~ApiZone() { }
+  ~ApiZone() {
+    Isolate* isolate = Isolate::Current();
+    if (isolate != NULL && isolate->current_zone() == &zone_) {
+      isolate->set_current_zone(zone_.previous_);
+    }
+    zone_.Unlink();
+  }
 
   // Allocates an array sized to hold 'len' elements of type
   // 'ElementType'.  Checks for integer overflow when performing the
   // size computation.
   template <class ElementType>
   ElementType* Alloc(intptr_t len) { return zone_.Alloc<ElementType>(len); }
 
   // Allocates an array sized to hold 'len' elements of type
   // 'ElementType'.  The new array is initialized from the memory of
   // 'old_array' up to 'old_len'.
   template <class ElementType>
   ElementType* Realloc(ElementType* old_array,
                        intptr_t old_len,
                        intptr_t new_len) {
     return zone_.Realloc<ElementType>(old_array, old_len, new_len);
   }
 
   // Allocates 'size' bytes of memory in the zone; expands the zone by
   // allocating new segments of memory on demand using 'new'.
   //
   // It is preferred to use Alloc<T>() instead, as that function can
   // check for integer overflow.  If you use AllocUnsafe, you are
   // responsible for avoiding integer overflow yourself.
   uword AllocUnsafe(intptr_t size) { return zone_.AllocUnsafe(size); }
 
   // Compute the total size of this zone. This includes wasted space that is
   // due to internal fragmentation in the segments.
   intptr_t SizeInBytes() const { return zone_.SizeInBytes(); }
 
+  Zone* GetZone() { return &zone_; }
+
  private:
-  Zone* GetBaseZone() { return &zone_; }
-
   Zone zone_;
 
   template<typename T> friend class ApiGrowableArray;
   DISALLOW_COPY_AND_ASSIGN(ApiZone);
 };
 
 
 // Implementation of local handles which are handed out from every
 // dart API call, these handles are valid only in the present scope
 // and are destroyed when a Dart_ExitScope() is called.
@@ skipping 352 matching lines @@
   intptr_t num_values_;
   DISALLOW_COPY_AND_ASSIGN(WeakReferenceSet);
 };
 
 
 // Structure used for the implementation of local scopes used in dart_api.
 // These local scopes manage handles and memory allocated in the scope.
 class ApiLocalScope {
  public:
   ApiLocalScope(ApiLocalScope* previous, uword stack_marker) :
-      previous_(previous), stack_marker_(stack_marker) { }
+      previous_(previous), stack_marker_(stack_marker) {

[Ivan Posva, 2012/10/12 21:46:33]

Emptr constructors on one line.

[Tom Ball, 2012/10/12 22:56:51]

Done.

+  }
   ~ApiLocalScope() {
     previous_ = NULL;
   }
 
   // Accessors.
   ApiLocalScope* previous() const { return previous_; }
   uword stack_marker() const { return stack_marker_; }
   void set_previous(ApiLocalScope* value) { previous_ = value; }
   LocalHandles* local_handles() { return &local_handles_; }
-  ApiZone* zone() { return &zone_; }
+  Zone* zone() { return zone_.GetZone(); }
 
  private:
   ApiLocalScope* previous_;
   uword stack_marker_;
   LocalHandles local_handles_;
   ApiZone zone_;
 
   DISALLOW_COPY_AND_ASSIGN(ApiLocalScope);
 };
 
@@ skipping 186 matching lines @@
   ~ApiNativeScope() {
     ASSERT(Current() == this);
     Thread::SetThreadLocal(Api::api_native_key_, 0);
   }
 
   static inline ApiNativeScope* Current() {
     return reinterpret_cast<ApiNativeScope*>(
         Thread::GetThreadLocal(Api::api_native_key_));
   }
 
-  ApiZone* zone() { return &zone_; }
+  Zone* zone() { return zone_.GetZone(); }
 
  private:
   ApiZone zone_;
   ThreadLocalKey key_;
 };
 
 
 // Api growable arrays use a zone for allocation. The constructor
 // picks the zone from the current isolate if in an isolate
 // environment. When outside an isolate environment it picks the zone
 // from the current native scope.
 template<typename T>
 class ApiGrowableArray : public BaseGrowableArray<T, ValueObject> {
  public:
   explicit ApiGrowableArray(int initial_capacity)
       : BaseGrowableArray<T, ValueObject>(
           initial_capacity,
-          ApiNativeScope::Current()->zone()->GetBaseZone()) {}
+          ApiNativeScope::Current()->zone()) {}
   ApiGrowableArray()
       : BaseGrowableArray<T, ValueObject>(
-          ApiNativeScope::Current()->zone()->GetBaseZone()) {}
+          ApiNativeScope::Current()->zone()) {}
 };
 
 
 }  // namespace dart
 
 #endif  // VM_DART_API_STATE_H_