Stop unwanted class finalization when using dart:io HttpClient from builtin.dart

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 115 matching lines @@
 
 FinalizablePersistentHandle* Api::UnwrapAsPrologueWeakPersistentHandle(
     Dart_WeakPersistentHandle object) {
   ASSERT(Isolate::Current()->api_state()->IsValidPrologueWeakPersistentHandle(
       object));
   return reinterpret_cast<FinalizablePersistentHandle*>(object);
 }
 
 
 Dart_Handle Api::CheckIsolateState(Isolate* isolate) {
   if (ClassFinalizer::FinalizePendingClasses() &&

[Ivan Posva, 2013/06/20 20:18:38]

Why don't you check just here?

[Cutch, 2013/06/20 20:27:02]

Done.

       isolate->object_store()->PreallocateObjects()) {
     return Api::Success();
   }
   ASSERT(isolate->object_store()->sticky_error() != Object::null());
   return Api::NewHandle(isolate, isolate->object_store()->sticky_error());
 }
 
 
 Dart_Isolate Api::CastIsolate(Isolate* isolate) {
   return reinterpret_cast<Dart_Isolate>(isolate);
@@ skipping 2812 matching lines @@
       return Api::NewHandle(isolate,
                             DartEntry::InvokeNoSuchMethod(instance,
                                                           function_name,
                                                           args,
                                                           args_descriptor));
     }
     return Api::NewHandle(isolate, DartEntry::InvokeFunction(function, args));
 
   } else if (obj.IsLibrary()) {
     // Check whether class finalization is needed.
-    bool finalize_classes = true;
+    bool finalize_classes = isolate->AllowClassFinalization();
     const Library& lib = Library::Cast(obj);
 
-    // When calling functions in the dart:builtin library do not finalize as it
-    // should have been prefinalized.
-    Library& builtin =
-        Library::Handle(isolate, isolate->object_store()->builtin_library());
-    if (builtin.raw() == lib.raw()) {
-      finalize_classes = false;
-    }
-
     // Finalize all classes if needed.
     if (finalize_classes) {
       Dart_Handle state = Api::CheckIsolateState(isolate);
       if (::Dart_IsError(state)) {
         return state;
       }
     }
 
     Function& function = Function::Handle(isolate);
     function = lib.LookupFunctionAllowPrivate(function_name);
@@ skipping 72 matching lines @@
 DART_EXPORT Dart_Handle Dart_GetField(Dart_Handle container, Dart_Handle name) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_CALLBACK_STATE(isolate);
 
   const String& field_name = Api::UnwrapStringHandle(isolate, name);
   if (field_name.IsNull()) {
     RETURN_TYPE_ERROR(isolate, name, String);
   }
 
-  // Finalize all classes.
-  Dart_Handle state = Api::CheckIsolateState(isolate);
-  if (::Dart_IsError(state)) {
-    return state;
+  bool finalize_classes = isolate->AllowClassFinalization();
+
+  if (finalize_classes) {
+    // Finalize all classes.
+    Dart_Handle state = Api::CheckIsolateState(isolate);
+    if (::Dart_IsError(state)) {
+      return state;
+    }
   }
+
   Field& field = Field::Handle(isolate);
   Function& getter = Function::Handle(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(container));
   if (obj.IsNull()) {
     return Api::NewError("%s expects argument 'container' to be non-null.",
                          CURRENT_FUNC);
   } else if (obj.IsType() || obj.IsClass()) {
     // To access a static field we may need to use the Field or the
     // getter Function.
     // For backwards compatibility we allow class objects to be passed in
@@ skipping 905 matching lines @@
   }
   {
     NoGCScope no_gc;
     RawObject* raw_obj = obj.raw();
     isolate->heap()->SetPeer(raw_obj, peer);
   }
   return Api::Success();
 }
 
 }  // namespace dart