Dart_PropagateError, take 2.

runtime/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/freelist.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 32 matching lines @@
 
 
 Isolate* Dart::CreateIsolate(const char* name_prefix) {
   // Create a new isolate.
   Isolate* isolate = Isolate::Init(name_prefix);
   ASSERT(isolate != NULL);
   return isolate;
 }
 
 
-void Dart::InitializeIsolate(const uint8_t* snapshot_buffer, void* data) {
+RawError* Dart::InitializeIsolate(const uint8_t* snapshot_buffer, void* data) {
   // Initialize the new isolate.
   TIMERSCOPE(time_isolate_initialization);
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   Zone zone(isolate);
   HandleScope handle_scope(isolate);
   Heap::Init(isolate);
   ObjectStore::Init(isolate);
 
   if (snapshot_buffer == NULL) {
-    Object::Init(isolate);
+    const Error& error = Error::Handle(Object::Init(isolate));
+    if (!error.IsNull()) {
+      return error.raw();
+    }
   } 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);
     reader.ReadFullSnapshot();
   }
 
   StubCode::Init(isolate);
   CodeIndexTable::Init(isolate);
   isolate->set_init_callback_data(data);
+  return Error::null();
 }
 
 
 void Dart::ShutdownIsolate() {
   Isolate* isolate = Isolate::Current();
   isolate->Shutdown();
   delete isolate;
 }
 
 }  // namespace dart