- Proper URI resolution when loading scripts from the standalone binary.

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 1993 matching lines @@
 // --- Methods and Fields ---
 
 
 DART_EXPORT Dart_Handle Dart_InvokeStatic(Dart_Handle library_in,
                                           Dart_Handle class_name_in,
                                           Dart_Handle function_name_in,
                                           int number_of_arguments,
                                           Dart_Handle* arguments) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  // Finalize all classes.
-  const char* msg = CheckIsolateState(isolate);
-  if (msg != NULL) {
-    return Api::NewError(msg);
-  }
-
-  // Now try to resolve and invoke the static function.
+  // Check whether class finalization is needed.
+  bool finalize_classes = true;
   const Library& library =
       Library::CheckedHandle(Api::UnwrapHandle(library_in));
   if (library.IsNull()) {
     return Api::NewError("No library specified");
   }
+
+  // When calling functions in the dart:builtin library do not finalize as it
+  // should have been prefinalized.
+  Library& builtin =
+      Library::Handle(isolate->object_store()->builtin_library());

[siva, 2012/03/07 18:32:17]

if (builtin.IsNull()) {
  return Api::NewError(".......");
}

[Ivan Posva, 2012/03/08 00:49:33]

Discussed offline.

+  if (builtin.raw() == library.raw()) {
+    finalize_classes = false;
+  }
+
+  // Finalize all classes if needed.
+  if (finalize_classes) {
+    const char* msg = CheckIsolateState(isolate);
+    if (msg != NULL) {
+      return Api::NewError(msg);
+    }
+  }
+
+  // Now try to resolve and invoke the static function.
   const String& class_name =
       String::CheckedHandle(Api::UnwrapHandle(class_name_in));
   const String& function_name =
       String::CheckedHandle(Api::UnwrapHandle(function_name_in));
   const Function& function = Function::Handle(
       Resolver::ResolveStatic(library,
                               class_name,
                               function_name,
                               number_of_arguments,
                               Array::Handle(),  // Named arguments are not yet
@@ skipping 606 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,
@@ skipping 81 matching lines @@
       *buffer = NULL;
     }
     delete debug_region;
   } else {
     *buffer = NULL;
     *buffer_size = 0;
   }
 }
 
 }  // namespace dart