- Get rid of RawClosure class and use RawInstance for closures.

lib/isolate.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 "platform/assert.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 380 matching lines @@
   state->isolate()->set_spawn_data(reinterpret_cast<uword>(state));
   state->isolate()->message_handler()->Run(
       Dart::thread_pool(), RunIsolate, ShutdownIsolate,
       reinterpret_cast<uword>(state->isolate()));
 
   return port.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(isolate_spawnFunction, 1) {
-  GET_NATIVE_ARGUMENT(Closure, closure, arguments->At(0));
-  const Function& func = Function::Handle(closure.function());
-  const Class& cls = Class::Handle(func.Owner());
-  if (!func.IsClosureFunction() || !func.is_static() || !cls.IsTopLevel()) {
+  GET_NATIVE_ARGUMENT(Instance, closure, arguments->At(0));
+  bool throw_exception = false;
+  Function& func = Function::Handle();
+  if (closure.IsClosure()) {
+    func ^= Closure::function(closure);
+    const Class& cls = Class::Handle(func.Owner());
+    if (!func.IsClosureFunction() || !func.is_static() || !cls.IsTopLevel()) {
+      throw_exception = true;
+    }
+  } else {
+    throw_exception = true;
+  }
+  if (throw_exception) {
     const String& msg = String::Handle(String::New(
         "spawnFunction expects to be passed a closure to a top-level static "
         "function"));
     ThrowIllegalArgException(msg);
   }
 
 #if defined(DEBUG)
-  const Context& ctx = Context::Handle(closure.context());
+  const Context& ctx = Context::Handle(Closure::context(closure));
   ASSERT(ctx.num_variables() == 0);
 #endif
 
   return Spawn(arguments, new SpawnState(func));
 }
 
 
 DEFINE_NATIVE_ENTRY(isolate_spawnUri, 1) {
   GET_NATIVE_ARGUMENT(String, uri, arguments->At(0));
 
@@ skipping 15 matching lines @@
 
 DEFINE_NATIVE_ENTRY(isolate_getPortInternal, 0) {
   const Object& port = Object::Handle(ReceivePortCreate(isolate->main_port()));
   if (port.IsError()) {
     Exceptions::PropagateError(Error::Cast(port));
   }
   return port.raw();
 }
 
 }  // namespace dart