Fix for bug 23484 (obscure error when a compilation error happens during Object::Init())

runtime/vm/bootstrap.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/bootstrap.h"
 
 #include "include/dart_api.h"
 
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
@@ skipping 216 matching lines @@
   String& source = String::Handle(isolate);
   Script& script = Script::Handle(isolate);
   Error& error = Error::Handle(isolate);
   const Array& strings = Array::Handle(isolate, Array::New(3));
   strings.SetAt(0, patch_uri);
   strings.SetAt(1, Symbols::Slash());
   for (intptr_t j = 0; patch_files[j] != NULL; j += 2) {
     patch_file_uri = String::New(patch_files[j]);
     source = GetLibrarySource(lib, patch_file_uri, true);
     if (source.IsNull()) {
-      return Api::UnwrapErrorHandle(
-          isolate,
-          Api::NewError("Unable to find dart patch source for %s",
-                        patch_file_uri.ToCString())).raw();
+      const String& message = String::Handle(
+          String::NewFormatted("Unable to find dart patch source for %s",
+                               patch_file_uri.ToCString()));
+      return ApiError::New(message);
     }
     // Prepend the patch library URI to form a unique script URI for the patch.
     strings.SetAt(2, patch_file_uri);
     patch_file_uri = String::ConcatAll(strings);
     script = Script::New(patch_file_uri, source, RawScript::kPatchTag);
     error = lib.Patch(script);
     if (!error.IsNull()) {
       return error.raw();
     }
   }
@@ skipping 34 matching lines @@
 
   // Load, compile and patch bootstrap libraries.
   for (intptr_t i = 0;
        bootstrap_libraries[i].index_ != ObjectStore::kNone;
        ++i) {
     uri = Symbols::New(bootstrap_libraries[i].uri_);
     lib = Library::LookupLibrary(uri);
     ASSERT(!lib.IsNull());
     source = GetLibrarySource(lib, uri, false);
     if (source.IsNull()) {
-      error ^= Api::UnwrapErrorHandle(
-          isolate, Api::NewError("Unable to find dart source for %s",
-                                 uri.ToCString())).raw();
+      const String& message = String::Handle(
+          String::NewFormatted("Unable to find dart source for %s",
+                               uri.ToCString()));
+      error ^= ApiError::New(message);
       break;
     }
     script = Script::New(uri, source, RawScript::kLibraryTag);
     error = Compile(lib, script);
     if (!error.IsNull()) {
       break;
     }
     // If a patch exists, load and patch the script.
     if (bootstrap_libraries[i].patch_paths_ != NULL) {
       patch_uri = Symbols::New(bootstrap_libraries[i].patch_uri_);
@@ skipping 20 matching lines @@
     Compiler::CompileClass(cls);
   }
 
   // Restore the library tag handler for the isolate.
   isolate->set_library_tag_handler(saved_tag_handler);
 
   return error.raw();
 }
 
 }  // namespace dart