Keep zone cached in SnapshotReader to allow removing ZoneHandle(Isolate*) interface.

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2013, 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 "include/dart_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "vm/class_finalizer.h"
@@ skipping 1695 matching lines @@
 }
 
 
 DART_EXPORT bool Dart_IsNull(Dart_Handle object) {
   return Api::UnwrapHandle(object) == Object::null();
 }
 
 
 DART_EXPORT Dart_Handle Dart_ObjectEquals(Dart_Handle obj1, Dart_Handle obj2,
                                           bool* value) {
-  Isolate* isolate = Isolate::Current();
+  Thread* thread = Thread::Current();
+  Isolate* isolate = thread->isolate();
+  Zone* zone = thread->zone();
   DARTSCOPE(isolate);
   CHECK_CALLBACK_STATE(isolate);
   const Instance& expected =
-      Instance::CheckedHandle(isolate, Api::UnwrapHandle(obj1));
+      Instance::CheckedHandle(zone, Api::UnwrapHandle(obj1));
   const Instance& actual =
-      Instance::CheckedHandle(isolate, Api::UnwrapHandle(obj2));
+      Instance::CheckedHandle(zone, Api::UnwrapHandle(obj2));
   const Object& result =
-      Object::Handle(isolate, DartLibraryCalls::Equals(expected, actual));
+      Object::Handle(zone, DartLibraryCalls::Equals(expected, actual));
   if (result.IsBool()) {
     *value = Bool::Cast(result).value();
     return Api::Success();
   } else if (result.IsError()) {
     return Api::NewHandle(isolate, result.raw());
   } else {
     return Api::NewError("Expected boolean result from ==");
   }
 }
 
@@ skipping 3265 matching lines @@
   CompileSource(isolate, library, script, &result);
   return result;
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadScriptFromSnapshot(const uint8_t* buffer,
                                                     intptr_t buffer_len) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   TIMERSCOPE(isolate, time_script_loading);
+  StackZone zone(isolate);
   if (buffer == NULL) {
     RETURN_NULL_ERROR(buffer);
   }
   NoHeapGrowthControlScope no_growth_control;
 
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
   if (!snapshot->IsScriptSnapshot()) {
     return Api::NewError("%s expects parameter 'buffer' to be a script type"
                          " snapshot.", CURRENT_FUNC);
   }
   if (snapshot->length() != buffer_len) {
     return Api::NewError("%s: 'buffer_len' of %" Pd " is not equal to %" Pd
                          " which is the expected length in the snapshot.",
                          CURRENT_FUNC, buffer_len, snapshot->length());
   }
   Library& library =
       Library::Handle(isolate, isolate->object_store()->root_library());
   if (!library.IsNull()) {
     const String& library_url = String::Handle(isolate, library.url());
     return Api::NewError("%s: A script has already been loaded from '%s'.",
                          CURRENT_FUNC, library_url.ToCString());
   }
   CHECK_CALLBACK_STATE(isolate);
 
   SnapshotReader reader(snapshot->content(),
                         snapshot->length(),
                         snapshot->kind(),
-                        isolate);
+                        isolate,
+                        zone.GetZone());
   const Object& tmp = Object::Handle(isolate, reader.ReadScriptSnapshot());
   if (tmp.IsError()) {
     return Api::NewHandle(isolate, tmp.raw());
   }
   library ^= tmp.raw();
   library.set_debuggable(true);
   isolate->object_store()->set_root_library(library);
   return Api::NewHandle(isolate, library.raw());
 }
 
@@ skipping 468 matching lines @@
 
 
 DART_EXPORT void Dart_RegisterRootServiceRequestCallback(
     const char* name,
     Dart_ServiceRequestCallback callback,
     void* user_data) {
   Service::RegisterRootEmbedderCallback(name, callback, user_data);
 }
 
 }  // namespace dart