Fix for issue 20992 - Allow sending static/top-level functions to other isolates which are spawned …

runtime/vm/object.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 "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 6066 matching lines @@
 
 bool Function::IsImplicitClosureFunction() const {
   if (!IsClosureFunction()) {
     return false;
   }
   const Function& parent = Function::Handle(parent_function());
   return (parent.implicit_closure_function() == raw());
 }
 
 
+bool Function::IsImplicitStaticClosureFunction(RawFunction* func) {
+  NoGCScope no_gc;
+  uint32_t kind_tag = func->ptr()->kind_tag_;
+  if (KindBits::decode(kind_tag) != RawFunction::kClosureFunction) {
+    return false;
+  }
+  if (!StaticBit::decode(kind_tag)) {
+    return false;
+  }
+  RawClosureData* data = reinterpret_cast<RawClosureData*>(func->ptr()->data_);
+  RawFunction* parent_function = data->ptr()->parent_function_;
+  return (parent_function->ptr()->data_ == reinterpret_cast<RawObject*>(func));
+}
+
+
 RawFunction* Function::New() {
   ASSERT(Object::function_class() != Class::null());
   RawObject* raw = Object::Allocate(Function::kClassId,
                                     Function::InstanceSize(),
                                     Heap::kOld);
   return reinterpret_cast<RawFunction*>(raw);
 }
 
 
 RawFunction* Function::New(const String& name,
@@ skipping 279 matching lines @@
       pieces.Add(Symbols::RBracket());
     } else {
       pieces.Add(Symbols::RBrace());
     }
   }
 }
 
 
 RawInstance* Function::ImplicitStaticClosure() const {
   if (implicit_static_closure() == Instance::null()) {
-    ObjectStore* object_store = Isolate::Current()->object_store();
-    const Context& context = Context::Handle(object_store->empty_context());
-    const Instance& closure =
-        Instance::Handle(Closure::New(*this, context, Heap::kOld));
+    Isolate* isolate = Isolate::Current();
+    ObjectStore* object_store = isolate->object_store();
+    const Context& context = Context::Handle(isolate,
+                                             object_store->empty_context());
+    Instance& closure =
+        Instance::Handle(isolate, Closure::New(*this, context, Heap::kOld));
+    const char* error_str = NULL;
+    closure ^= closure.CheckAndCanonicalize(&error_str);
+    ASSERT(!closure.IsNull());
     set_implicit_static_closure(closure);
   }
   return implicit_static_closure();
 }
 
 
 RawString* Function::BuildSignature(bool instantiate,
                                     NameVisibility name_visibility,
                                     const TypeArguments& instantiator) const {
   const GrowableObjectArray& pieces =
@@ skipping 14293 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart