- Fix the snapshot generation python script to return an error code when snapshot generation fail...

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 238 matching lines @@
 
 
 DEFINE_NATIVE_ENTRY(IsolateNatives_start, 2) {
   Isolate* preserved_isolate = Isolate::Current();
   const Instance& runnable = Instance::CheckedHandle(arguments->At(0));
   const Class& runnable_class = Class::Handle(runnable.clazz());
   const char* class_name = String::Handle(runnable_class.Name()).ToCString();
   const Library& library = Library::Handle(runnable_class.library());
   ASSERT(!library.IsNull());
   const char* library_url = String::Handle(library.url()).ToCString();
-
   intptr_t port_id = 0;
   const char* error_msg = NULL;
+  LongJump jump;
+  bool init_successful = true;
 
-  Isolate* spawned_isolate =
-      Dart::CreateIsolate(NULL, preserved_isolate->init_callback_data());
+  Isolate* spawned_isolate = Dart::CreateIsolate();
   if (spawned_isolate != NULL) {
+    // First initialize the spawned isolate.
+    LongJump* base = spawned_isolate->long_jump_base();
+    spawned_isolate->set_long_jump_base(&jump);
+    if (setjmp(*jump.Set()) == 0) {
+      Dart::InitializeIsolate(NULL, preserved_isolate->init_callback_data());
+    } else {
+      init_successful = false;
+    }
+    spawned_isolate->set_long_jump_base(base);
     // Check arguments to see if the specified library and classes are
     // loaded, this check will throw an exception if they are not loaded.
-    if (CheckArguments(library_url, class_name)) {
+    if (init_successful && CheckArguments(library_url, class_name)) {
       port_id = PortMap::CreatePort();
       uword data = reinterpret_cast<uword>(
           new IsolateStartData(spawned_isolate,
                                strdup(library_url),
                                strdup(class_name),
                                port_id));
       new Thread(RunIsolate, data);
     } else {
-      // Error loading application into spawned isolate, shut it down and
-      // report error.
+      // 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;
         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();
@@ skipping 47 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