- Make the URI resolution methods used by the tag handler private.

runtime/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 2186 matching lines @@
       return Api::NewError("%s: did not find static method '%s.%s'.",
                            CURRENT_FUNC,
                            cls_name.ToCString(),
                            function_name.ToCString());
     }
     const Object& result = Object::Handle(
         DartEntry::InvokeStatic(function, dart_args, kNoArgNames));
     return Api::NewLocalHandle(result);
 
   } else if (obj.IsLibrary()) {
-    // Finalize all classes.
-    const char* msg = CheckIsolateState(isolate);
-    if (msg != NULL) {
-      return Api::NewError(msg);
+    // Check whether class finalization is needed.
+    bool finalize_classes = true;
+    Library& lib = Library::Handle();
+    lib ^= obj.raw();
+
+    // 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());
+    if (builtin.raw() == lib.raw()) {
+      finalize_classes = false;
     }
 
-    Library& lib = Library::Handle();
-    lib ^= obj.raw();
+    // Finalize all classes if needed.
+    if (finalize_classes) {
+      const char* msg = CheckIsolateState(isolate);
+      if (msg != NULL) {
+        return Api::NewError(msg);
+      }
+    }
+
     const Function& function = Function::Handle(
         lib.LookupLocalFunction(function_name));
     if (function.IsNull()) {
       return Api::NewError("%s: did not find top-level function '%s'.",
                            CURRENT_FUNC,
                            function_name.ToCString());
     }
     const Object& result = Object::Handle(
         DartEntry::InvokeStatic(function, dart_args, kNoArgNames));
     return Api::NewLocalHandle(result);
@@ skipping 1020 matching lines @@
       *buffer = NULL;
     }
     delete debug_region;
   } else {
     *buffer = NULL;
     *buffer_size = 0;
   }
 }
 
 }  // namespace dart