- Move finalization until after the classes in dart:builtin have been loaded.

vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 2966 matching lines @@
   const Array& mapping_array = Api::UnwrapArrayHandle(import_map);
   Library& library = Library::Handle(Library::LookupLibrary(url_str));
   if (library.IsNull()) {
     library = Library::New(url_str);
     if (mapping_array.IsNull()) {
       library.set_import_map(Array::Handle(Array::Empty()));
     } else {
       library.set_import_map(mapping_array);
     }
     library.Register();
-    // If this is the dart:builtin library register it with the VM.
-    if (url_str.Equals("dart:builtin")) {
-      isolate->object_store()->set_builtin_library(library);
-      const char* msg = CheckIsolateState(isolate);
-      if (msg != NULL) {
-        return Api::NewError(msg);
-      }
-    }
   } else if (!library.LoadNotStarted()) {
     // The source for this library has either been loaded or is in the
     // process of loading.  Return an error.
     return Api::NewError("%s: library '%s' has already been loaded.",
                          CURRENT_FUNC, url_str.ToCString());
   }
   Dart_Handle result;
   CompileSource(isolate,
                 library,
                 url_str,
                 source_str,
                 RawScript::kLibrary,
                 &result);
+  // Propagate the error out right now.
+  if (Dart_IsError(result)) {
+    return result;
+  }
+
+  // If this is the dart:builtin library register it with the VM.
+  if (url_str.Equals("dart:builtin")) {
+    isolate->object_store()->set_builtin_library(library);
+    const char* msg = CheckIsolateState(isolate);
+    if (msg != NULL) {
+      return Api::NewError(msg);
+    }
+  }
   return result;
 }
 
 
 DART_EXPORT Dart_Handle Dart_LibraryImportLibrary(Dart_Handle library,
                                                   Dart_Handle import) {
   DARTSCOPE(Isolate::Current());
   const Library& library_vm = Api::UnwrapLibraryHandle(library);
   if (library_vm.IsNull()) {
     RETURN_TYPE_ERROR(library, Library);
@@ skipping 68 matching lines @@
       *buffer = NULL;
     }
     delete debug_region;
   } else {
     *buffer = NULL;
     *buffer_size = 0;
   }
 }
 
 }  // namespace dart