Changes to pass the current isolate to all runtime and native calls.

runtime/lib/isolate.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 "vm/assert.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
 #include "vm/dart_entry.h"
@@ skipping 128 matching lines @@
   delete data;
 
   Isolate::SetCurrent(isolate);
   // Intialize stack limit in case we are running isolate in a
   // different thread than in which it was initialized.
   isolate->SetStackLimitFromCurrentTOS(reinterpret_cast<uword>(&isolate));
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
   if (setjmp(*jump.Set()) == 0) {
-    Zone zone;
-    HandleScope handle_scope;
+    Zone zone(isolate);
+    HandleScope handle_scope(isolate);
     ASSERT(ClassFinalizer::FinalizePendingClasses());
     // Lookup the target class by name, create an instance and call the run
     // method.
     const String& lib_name = String::Handle(String::NewSymbol(library_url));
     const Library& lib = Library::Handle(Library::LookupLibrary(lib_name));
     ASSERT(!lib.IsNull());
     const String& cls_name = String::Handle(String::NewSymbol(class_name));
     const Class& target_class = Class::Handle(lib.LookupClass(cls_name));
     // TODO(iposva): Deserialize or call the constructor after allocating.
     // For now, we only support a non-parameterized or raw target class.
@@ skipping 38 matching lines @@
     if (result.IsUnhandledException()) {
       UnhandledException& uhe = UnhandledException::Handle();
       uhe ^= result.raw();
       ProcessUnhandledException(uhe);
     }
     ASSERT(result.IsNull());
     free(class_name);
     isolate->StandardRunLoop();
 
   } else {
-    Zone zone;
-    HandleScope handle_scope;
+    Zone zone(isolate);
+    HandleScope handle_scope(isolate);
     const String& error = String::Handle(
         Isolate::Current()->object_store()->sticky_error());
     const char* errmsg = error.ToCString();
     fprintf(stderr, "%s\n", errmsg);
     exit(255);
   }
   isolate->set_long_jump_base(base);
   Dart::ShutdownIsolate();
 }
 
 
 static bool CheckArguments(const char* library_url, const char* class_name) {
-  Zone zone;
-  HandleScope handle_scope;
+  Isolate* isolate = Isolate::Current();
+  Zone zone(isolate);
+  HandleScope handle_scope(isolate);
   String& name = String::Handle();
   if (!ClassFinalizer::FinalizePendingClasses()) {
     return false;
   }
   // Lookup the target class by name, create an instance and call the run
   // method.
   name ^= String::NewSymbol(library_url);
   const Library& lib = Library::Handle(Library::LookupLibrary(name));
   if (lib.IsNull()) {
     const String& error = String::Handle(
@@ skipping 47 matching lines @@
                                strdup(class_name),
                                port_id));
       new Thread(RunIsolate, data);
     } else {
       // Error spawning the isolate, maybe due to initialization errors or
       // errors while loading the application into spawned isolate, shut
       // it down and report error.
       // Make sure to grab the error message out of the isolate before it has
       // been shutdown and to allocate it in the preserved isolates zone.
       {
-        Zone zone;
-        HandleScope scope;
+        Zone zone(spawned_isolate);
+        HandleScope scope(spawned_isolate);
         const String& error = String::Handle(
             spawned_isolate->object_store()->sticky_error());
         const char* temp_error_msg = error.ToCString();
         intptr_t err_len = strlen(temp_error_msg) + 1;
         Zone* preserved_zone = preserved_isolate->current_zone();
         error_msg = reinterpret_cast<char*>(preserved_zone->Allocate(err_len));
         OS::SNPrint(
             const_cast<char*>(error_msg), err_len, "%s", temp_error_msg);
       }
       Dart::ShutdownIsolate();
@@ skipping 42 matching lines @@
   intptr_t send_id = Smi::CheckedHandle(arguments->At(0)).Value();
   intptr_t reply_id = Smi::CheckedHandle(arguments->At(1)).Value();
   // TODO(iposva): Allow for arbitrary messages to be sent.
   void* data = SerializeObject(Instance::CheckedHandle(arguments->At(2)));
 
   // TODO(turnidge): Throw an exception when the return value is false?
   PortMap::PostMessage(send_id, reply_id, data);
 }
 
 }  // namespace dart