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

vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 64 matching lines @@
 // TODO(iposva): This is a placeholder for the eventual external Dart API.
 DART_EXPORT bool Dart_Initialize(int argc,
                                  char** argv,
                                  Dart_IsolateInitCallback callback) {
   return Dart::InitOnce(argc, argv, callback);
 }
 
 
 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);
 }
 
 
 DART_EXPORT void Dart_ShutdownIsolate() {
   ASSERT(Isolate::Current() != NULL);
   STOP_TIMER(time_total_runtime);
   Dart::ShutdownIsolate();
 }
 
 
@@ skipping 1900 matching lines @@
   ASSERT(isolate != NULL);
   ApiState* state = isolate->api_state();
   ASSERT(state != NULL);
   ApiLocalScope* scope = state->top_scope();
   ASSERT(scope != NULL);
   return scope->zone().Reallocate(ptr, old_size, new_size);
 }
 
 
 }  // namespace dart