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

vm/dart_api_impl.cc

Index: vm/dart_api_impl.cc
===================================================================
--- vm/dart_api_impl.cc	(revision 1129)
+++ vm/dart_api_impl.cc	(working copy)
@@ -82,10 +82,27 @@
 
 DART_EXPORT Dart_Isolate Dart_CreateIsolate(const Dart_Snapshot* snapshot,
                                             void* data) {
-  ASSERT(Isolate::Current() == NULL);
-  Isolate* isolate = Dart::CreateIsolate(snapshot, data);
-  START_TIMER(time_total_runtime);
-  return reinterpret_cast<Dart_Isolate>(isolate);
+  Isolate* isolate = Dart::CreateIsolate();
+  ASSERT(isolate != NULL);
+  LongJump jump;
+  isolate->set_long_jump_base(&jump);
+  if (setjmp(*jump.Set()) == 0) {
+    Dart::InitializeIsolate(snapshot, data);
+    START_TIMER(time_total_runtime);
+    isolate->set_long_jump_base(NULL);

[Ivan Posva, 2011/11/04 17:24:42]

ditto.

[siva, 2011/11/04 22:01:57]

Done.

+    return reinterpret_cast<Dart_Isolate>(isolate);
+  } else {
+    {
+      Zone zone;  // Setup a VM zone as we are creating some handles.
+      HandleScope scope;  // Setup a VM handle scope.
+      const String& error =
+          String::Handle(Isolate::Current()->object_store()->sticky_error());
+      // TODO(asiva): Need to return this as a error.
+      OS::PrintErr(error.ToCString());
+    }
+    Dart::ShutdownIsolate();
+  }
+  return reinterpret_cast<Dart_Isolate>(NULL);
 }