Dart_PropagateError, take 2.

runtime/vm/object_store.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/object_store.h"
 
 #include "vm/exceptions.h"
 #include "vm/isolate.h"
-#include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 ObjectStore::ObjectStore()
   : object_class_(Class::null()),
     function_interface_(Type::null()),
     number_interface_(Type::null()),
@@ skipping 53 matching lines @@
   ASSERT(isolate->object_store() == NULL);
   ObjectStore* store = new ObjectStore();
   isolate->set_object_store(store);
 }
 
 
 bool ObjectStore::PreallocateObjects() {
   if (preallocate_objects_called_) {
     return true;
   }
-
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL && isolate->object_store() == this);
-  LongJump* base = isolate->long_jump_base();
-  LongJump jump;
-  isolate->set_long_jump_base(&jump);
-  if (setjmp(*jump.Set()) == 0) {
-    GrowableArray<const Object*> args;
-    Instance& exception =Instance::Handle();
-    exception = Exceptions::Create(Exceptions::kStackOverflow, args);
-    set_stack_overflow(exception);
-    exception = Exceptions::Create(Exceptions::kOutOfMemory, args);
-    set_out_of_memory(exception);
-  } else {
+  GrowableArray<const Object*> args;
+  Object& result = Object::Handle();
+  Instance& exception = Instance::Handle();
+
+  result = Exceptions::Create(Exceptions::kStackOverflow, args);
+  if (result.IsError()) {
     return false;
   }
-  isolate->set_long_jump_base(base);
+  exception ^= result.raw();
+  set_stack_overflow(exception);
+
+  result = Exceptions::Create(Exceptions::kOutOfMemory, args);
+  if (result.IsError()) {
+    return false;
+  }
+  exception ^= result.raw();
+  set_out_of_memory(exception);
+
   preallocate_objects_called_ = true;
   return true;
 }
 
 
 RawClass* ObjectStore::GetClass(int index) {
   switch (index) {
     case kObjectClass: return object_class_;
     case kSmiClass: return smi_class_;
     case kMintClass: return mint_class_;
@@ skipping 107 matching lines @@
     return kStringInterface;
   } else if (raw_type == list_interface()) {
     return kListInterface;
   } else if (raw_type == byte_array_interface()) {
     return kByteArrayInterface;
   }
   return kInvalidIndex;
 }
 
 }  // namespace dart