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

runtime/lib/object.cc

 // Copyright (c) 2011, 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 "vm/bootstrap_natives.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/code_patcher.h"
 #include "vm/exceptions.h"
 #include "vm/heap.h"
@@ skipping 140 matching lines @@
       Report::JSWarningFromNative(
           false,  // Object_instanceOf and Object_as are not static calls.
           "integer value is also considered to be of type 'double'");
     }
   }
 }
 
 
 DEFINE_NATIVE_ENTRY(Object_instanceOf, 5) {
   const Instance& instance =
-      Instance::CheckedHandle(isolate, arguments->NativeArgAt(0));
+      Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
   // Instantiator at position 1 is not used. It is passed along so that the call
   // can be easily converted to an optimized implementation. Instantiator is
   // used to populate the subtype cache.
   const TypeArguments& instantiator_type_arguments =
-      TypeArguments::CheckedHandle(isolate, arguments->NativeArgAt(2));
+      TypeArguments::CheckedHandle(zone, arguments->NativeArgAt(2));
   const AbstractType& type =
-      AbstractType::CheckedHandle(isolate, arguments->NativeArgAt(3));
-  const Bool& negate = Bool::CheckedHandle(isolate, arguments->NativeArgAt(4));
+      AbstractType::CheckedHandle(zone, arguments->NativeArgAt(3));
+  const Bool& negate = Bool::CheckedHandle(zone, arguments->NativeArgAt(4));
   ASSERT(type.IsFinalized());
   ASSERT(!type.IsMalformed());
   ASSERT(!type.IsMalbounded());
 
   // Check for javascript compatibility.
   if (FLAG_warn_on_javascript_compatibility) {
     WarnOnJSIntegralNumTypeTest(instance, instantiator_type_arguments, type);
   }
 
-  Error& bound_error = Error::Handle(isolate, Error::null());
+  Error& bound_error = Error::Handle(zone, Error::null());
   const bool is_instance_of = instance.IsInstanceOf(type,
                                                     instantiator_type_arguments,
                                                     &bound_error);
   if (FLAG_trace_type_checks) {
     const char* result_str = is_instance_of ? "true" : "false";
     OS::Print("Native Object.instanceOf: result %s\n", result_str);
     const Type& instance_type = Type::Handle(instance.GetType());
     OS::Print("  instance type: %s\n",
               String::Handle(instance_type.Name()).ToCString());
     OS::Print("  test type: %s\n", String::Handle(type.Name()).ToCString());
     if (!bound_error.IsNull()) {
       OS::Print("  bound error: %s\n", bound_error.ToErrorCString());
     }
   }
   if (!is_instance_of && !bound_error.IsNull()) {
     // Throw a dynamic type error only if the instanceof test fails.
     DartFrameIterator iterator;
     StackFrame* caller_frame = iterator.NextFrame();
     ASSERT(caller_frame != NULL);
     const intptr_t location = caller_frame->GetTokenPos();
     String& bound_error_message = String::Handle(
-        isolate, String::New(bound_error.ToErrorCString()));
+        zone, String::New(bound_error.ToErrorCString()));
     Exceptions::CreateAndThrowTypeError(
         location, Symbols::Empty(), Symbols::Empty(),
         Symbols::Empty(), bound_error_message);
     UNREACHABLE();
   }
   return Bool::Get(negate.value() ? !is_instance_of : is_instance_of).raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Object_as, 4) {
@@ skipping 101 matching lines @@
   // Currently all errors are Dart instances, e.g. I/O errors
   // created by deferred loading code. LanguageErrors from
   // failed loading or finalization attempts are propagated and result
   // in the isolate's death.
   const Instance& error = Instance::Handle(prefix.LoadError());
   return error.raw();
 }
 
 
 }  // namespace dart