Renamed Zone->StackZone, BaseZone->Zone, in preparation for changing isolate->get_zone() to return …

runtime/lib/isolate.cc

 // 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.
 
 #include "platform/assert.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 68 matching lines @@
   return result.raw();
 }
 
 
 static void ShutdownIsolate(uword parameter) {
   Isolate* isolate = reinterpret_cast<Isolate*>(parameter);
   {
     // Print the error if there is one.  This may execute dart code to
     // print the exception object, so we need to use a StartIsolateScope.
     StartIsolateScope start_scope(isolate);
-    Zone zone(isolate);
+    StackZone zone(isolate);
     HandleScope handle_scope(isolate);
     Error& error = Error::Handle();
     error = isolate->object_store()->sticky_error();
     if (!error.IsNull()) {
       OS::PrintErr("%s\n", error.ToErrorCString());
       exit(255);
     }
   }
   {
     // Shut the isolate down.
@@ skipping 61 matching lines @@
   args.Add(&message);
   Exceptions::ThrowByType(Exceptions::kIsolateSpawn, args);
 }
 
 
 static bool CanonicalizeUri(Isolate* isolate,
                             const Library& library,
                             const String& uri,
                             char** canonical_uri,
                             char** error) {
-  Zone* zone = isolate->current_zone();
+  StackZone* zone = isolate->current_zone();
   Dart_LibraryTagHandler handler = isolate->library_tag_handler();
   if (handler == NULL) {
     *error = zone->PrintToString(
         "Unable to canonicalize uri '%s': no library tag handler found.",
         uri.ToCString());
     return false;
   }
   Dart_Handle result = handler(kCanonicalizeUrl,
                                Api::NewHandle(isolate, library.raw()),
                                Api::NewHandle(isolate, uri.raw()));
@@ skipping 122 matching lines @@
   Isolate* child_isolate = Isolate::Current();
   ASSERT(child_isolate);
   state->set_isolate(child_isolate);
 
   // Attempt to resolve the entry function now, so that we fail fast
   // in the case that the function cannot be resolved.
   //
   // TODO(turnidge): Revisit this once we have an isolate death api.
   bool resolve_error = false;
   {
-    Zone zone(child_isolate);
+    StackZone zone(child_isolate);
     HandleScope handle_scope(child_isolate);
     const Object& result = Object::Handle(state->ResolveFunction());
     if (result.IsError()) {
       Error& errobj = Error::Handle();
       errobj ^= result.raw();
       *error = strdup(errobj.ToErrorCString());
       resolve_error = true;
     }
   }
   if (resolve_error) {
     Dart::ShutdownIsolate();
     Isolate::SetCurrent(parent_isolate);
     return false;
   }
 
   Isolate::SetCurrent(parent_isolate);
   return true;
 }
 
 
 static bool RunIsolate(uword parameter) {
   Isolate* isolate = reinterpret_cast<Isolate*>(parameter);
   SpawnState* state = reinterpret_cast<SpawnState*>(isolate->spawn_data());
   isolate->set_spawn_data(NULL);
   {
     StartIsolateScope start_scope(isolate);
-    Zone zone(isolate);
+    StackZone zone(isolate);
     HandleScope handle_scope(isolate);
     if (!ClassFinalizer::FinalizePendingClasses()) {
       // Error is in sticky error already.
       return false;
     }
     Object& result = Object::Handle();
 
     result = state->ResolveFunction();
     delete state;
     state = NULL;
@@ skipping 86 matching lines @@
 
 DEFINE_NATIVE_ENTRY(isolate_getPortInternal, 0) {
   const Object& port = Object::Handle(ReceivePortCreate(isolate->main_port()));
   if (port.IsError()) {
     Exceptions::PropagateError(Error::Cast(port));
   }
   return port.raw();
 }
 
 }  // namespace dart