Defer marking libraries as ‘loaded’

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2013, 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 "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
@@ skipping 4730 matching lines @@
                           Dart_Handle* result) {
   bool update_lib_status = (script.kind() == RawScript::kScriptTag ||
                             script.kind() == RawScript::kLibraryTag);
   if (update_lib_status) {
     lib.SetLoadInProgress();
   }
   ASSERT(isolate != NULL);
   const Error& error = Error::Handle(isolate, Compiler::Compile(lib, script));
   if (error.IsNull()) {
     *result = Api::NewHandle(isolate, lib.raw());
-    if (update_lib_status) {
-      lib.SetLoaded();
-    }
   } else {
     *result = Api::NewHandle(isolate, error.raw());
-    if (update_lib_status) {
-      lib.SetLoadError();
-    }
+    lib.SetLoadError();
   }
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadScript(Dart_Handle url,
                                         Dart_Handle source,
                                         intptr_t line_offset,
                                         intptr_t col_offset) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
@@ skipping 375 matching lines @@
 }
 
 
 // Finalizes classes and invokes Dart core library function that completes
 // futures of loadLibrary calls (deferred library loading).
 DART_EXPORT Dart_Handle Dart_FinalizeLoading() {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_CALLBACK_STATE(isolate);
 
+  isolate->DoneLoading();
+
+  // TODO(hausner): move the remaining code below (finalization and
+  // invoing of _completeDeferredLoads) into Isolate::DoneLoading().
+
   // Finalize all classes if needed.
   Dart_Handle state = Api::CheckIsolateState(isolate);
   if (::Dart_IsError(state)) {
     return state;
   }
 
   const Library& corelib = Library::Handle(isolate, Library::CoreLibrary());
   const String& function_name =
       String::Handle(isolate, String::New("_completeDeferredLoads"));
   const Function& function =
@@ skipping 93 matching lines @@
 
 
 DART_EXPORT void Dart_RegisterRootServiceRequestCallback(
     const char* name,
     Dart_ServiceRequestCallback callback,
     void* user_data) {
   Service::RegisterRootEmbedderCallback(name, callback, user_data);
 }
 
 }  // namespace dart