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

vm/dart.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/dart.h"
 
 #include "vm/code_index_table.h"
 #include "vm/flags.h"
 #include "vm/handles.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
+#include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/port.h"
 #include "vm/snapshot.h"
 #include "vm/stub_code.h"
 #include "vm/virtual_memory.h"
 #include "vm/zone.h"
 
 namespace dart {
 
@@ skipping 22 matching lines @@
     StubCode::InitOnce();
     PortMap::InitOnce();
     Scanner::InitOnce();
   }
   Isolate::SetCurrent(NULL);  // Unregister the VM isolate from this thread.
   Isolate::SetInitCallback(callback);
   return true;
 }
 
 
-Isolate* Dart::CreateIsolate(const Dart_Snapshot* snapshot_buffer,
-                             void* data) {
+Isolate* Dart::CreateIsolate() {
   // Create and initialize a new isolate.
   Isolate* isolate = Isolate::Init();
+  ASSERT(isolate != NULL);
+  return isolate;
+}
+
+
+void Dart::InitializeIsolate(const Dart_Snapshot* snapshot_buffer, void* data) {
+  // Initialize the new isolate.
+  Isolate* isolate = Isolate::Current();
+  ASSERT(isolate != NULL);
   Zone zone;
   HandleScope handle_scope;
   Heap::Init(isolate);
   ObjectStore::Init(isolate);
 
   if (snapshot_buffer == NULL) {
     Object::Init(isolate);
   } else {
     // Initialize from snapshot (this should replicate the functionality
     // of Object::Init(..) in a regular isolate creation path.
     Object::InitFromSnapshot(isolate);
     const Snapshot* snapshot = Snapshot::SetupFromBuffer(snapshot_buffer);
-    SnapshotReader reader(snapshot, isolate->heap(), isolate->object_store());
+    SnapshotReader reader(snapshot,
+                          isolate->heap(),
+                          isolate->object_store());
     reader.ReadFullSnapshot();
   }
 
   StubCode::Init(isolate);
   CodeIndexTable::Init(isolate);
 
   // Give the embedder a shot at setting up this isolate.
-  // Isolates spawned from within this isolate will be given the callback data
-  // returned by the callback.
+  // Isolates spawned from within this isolate will be given the
+  // callback data returned by the callback.
   data = Isolate::InitCallback()(data);
-  // TODO(iposva): Shutdown the isolate on failure.
   isolate->set_init_callback_data(data);
-  return isolate;
 }
 
 
 void Dart::ShutdownIsolate() {
   Isolate* isolate = Isolate::Current();
   isolate->Shutdown();
   delete isolate;
 }
 
 }  // namespace dart