Dart_PropagateError, take 2.

runtime/vm/object.cc

 // Copyright (c) 2012, 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.h"
 
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 381 matching lines @@
                            const char* cname,
                            const Script& script,
                            const Library& lib) {
   const String& name = String::Handle(String::NewSymbol(cname));
   cls.set_name(name);
   cls.set_script(script);
   lib.AddClass(cls);
 }
 
 
-void Object::Init(Isolate* isolate) {
+RawError* Object::Init(Isolate* isolate) {
   TIMERSCOPE(time_bootstrap);
   ObjectStore* object_store = isolate->object_store();
 
   Class& cls = Class::Handle();
   Type& type = Type::Handle();
   Array& array = Array::Handle();
 
   // All RawArray fields will be initialized to an empty array, therefore
   // initialize array class first.
   cls = Class::New<Array>();
@@ skipping 225 matching lines @@
   bool_value = Bool::New(false);
   object_store->set_false_value(bool_value);
 
   // Setup some default native field classes which can be extended for
   // specifying native fields in dart classes.
   Library::InitNativeWrappersLibrary(isolate);
   ASSERT(isolate->object_store()->native_wrappers_library() != Library::null());
 
   // Finish the initialization by compiling the bootstrap scripts containing the
   // base interfaces and the implementation of the internal classes.
-  Bootstrap::Compile(core_lib, script);
-  Bootstrap::Compile(core_impl_lib, impl_script);
+  Error& error = Error::Handle();
+  error = Bootstrap::Compile(core_lib, script);
+  if (!error.IsNull()) {
+    return error.raw();
+  }
+  error = Bootstrap::Compile(core_impl_lib, impl_script);
+  if (!error.IsNull()) {
+    return error.raw();
+  }
 
   Bootstrap::SetupNativeResolver();
 
   // Remove the Object superclass cycle by setting the super type to null (not
   // to the type of null).
   cls = object_store->object_class();
   cls.set_super_type(Type::Handle());
 
   ClassFinalizer::VerifyBootstrapClasses();
+  return Error::null();
 }
 
 
 void Object::InitFromSnapshot(Isolate* isolate) {
   TIMERSCOPE(time_bootstrap);
   ObjectStore* object_store = isolate->object_store();
 
   Class& cls = Class::Handle();
 
   // Set up empty classes in the object store, these will get
@@ skipping 4017 matching lines @@
   ASSERT(value.IsSymbol());
   StorePointer(&raw_ptr()->name_, value.raw());
 }
 
 
 void LibraryPrefix::set_library(const Library& value) const {
   StorePointer(&raw_ptr()->library_, value.raw());
 }
 
 
-void Library::CompileAll() {
+RawError* Library::CompileAll() {
+  Error& error = Error::Handle();
   Library& lib = Library::Handle(
       Isolate::Current()->object_store()->registered_libraries());
   Class& cls = Class::Handle();
   while (!lib.IsNull()) {
     ClassDictionaryIterator it(lib);
     while (it.HasNext()) {
       cls ^= it.GetNextClass();
       if (!cls.is_interface()) {
-        Compiler::CompileAllFunctions(cls);
+        error = Compiler::CompileAllFunctions(cls);
       }
     }
     Array& anon_classes = Array::Handle(lib.raw_ptr()->anonymous_classes_);
     for (int i = 0; i < lib.raw_ptr()->num_anonymous_; i++) {
       cls ^= anon_classes.At(i);
       ASSERT(!cls.is_interface());
-      Compiler::CompileAllFunctions(cls);
+      error = Compiler::CompileAllFunctions(cls);
     }
     lib = lib.next_registered();
   }
+  return error.raw();
 }
 
 
 RawInstructions* Instructions::New(intptr_t size) {
   const Class& instructions_class = Class::Handle(Object::instructions_class());
   Instructions& result = Instructions::Handle();
   {
     uword aligned_size = Instructions::InstanceSize(size);
     RawObject* raw = Object::Allocate(instructions_class,
                                       aligned_size,
@@ skipping 3200 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart