Fix VM not accepting static methods for Isolate.spawn.

runtime/vm/isolate.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 "vm/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
 #include "lib/mirrors.h"
@@ skipping 978 matching lines @@
   T* handle = reinterpret_cast<T*>(reusable_handles_.AllocateScopedHandle());
   T::initializeHandle(handle, T::null());
   return handle;
 }
 
 
 IsolateSpawnState::IsolateSpawnState(const Function& func)
     : isolate_(NULL),
       script_url_(NULL),
       library_url_(NULL),
+      class_name_(NULL),
       function_name_(NULL),
       exception_callback_name_(NULL) {
   script_url_ = NULL;
   const Class& cls = Class::Handle(func.Owner());
-  ASSERT(cls.IsTopLevel());
   const Library& lib = Library::Handle(cls.library());
   const String& lib_url = String::Handle(lib.url());
   library_url_ = strdup(lib_url.ToCString());
 
   const String& func_name = String::Handle(func.name());
   function_name_ = strdup(func_name.ToCString());
+  if (!cls.IsTopLevel()) {
+    const String& class_name = String::Handle(cls.Name());
+    class_name_ = strdup(class_name.ToCString());

[Ivan Posva, 2013/11/12 07:19:49]

Leak!

[Lasse Reichstein Nielsen, 2013/11/12 07:28:51]

Beacuse I'm not freeing it somewhere else? (which makes sense, I'll see if I can
find where the other fields are freed).
Or is there some other reason why this is a leak, and not function_name_ above?

+  }
   exception_callback_name_ = strdup("_unhandledExceptionCallback");
 }
 
 
 IsolateSpawnState::IsolateSpawnState(const char* script_url)
     : isolate_(NULL),
       library_url_(NULL),
       function_name_(NULL),
       exception_callback_name_(NULL) {
   script_url_ = strdup(script_url);
@@ skipping 21 matching lines @@
       const String& msg = String::Handle(String::NewFormatted(
           "Unable to find library '%s'.", library_url()));
       return LanguageError::New(msg);
     }
   } else {
     lib = isolate()->object_store()->root_library();
   }
   ASSERT(!lib.IsNull());
 
   // Resolve the function.
-  const String& func_name =
-      String::Handle(String::New(function_name()));
-  const Function& func = Function::Handle(lib.LookupLocalFunction(func_name));
+  const String& func_name = String::Handle(String::New(function_name()));
+
+  if (class_name() == NULL) {
+    const Function& func = Function::Handle(lib.LookupLocalFunction(func_name));
+    if (func.IsNull()) {
+      const String& msg = String::Handle(String::NewFormatted(
+          "Unable to resolve function '%s' in library '%s'.",
+          function_name(), (library_url() ? library_url() : script_url())));

[Ivan Posva, 2013/11/12 07:19:49]

ditto (see below).

[Lasse Reichstein Nielsen, 2013/11/12 07:28:51]

Done.

+      return LanguageError::New(msg);
+    }
+    return func.raw();
+  }
+
+  const String& cls_name = String::Handle(String::New(class_name()));
+  const Class& cls = Class::Handle(lib.LookupLocalClass(cls_name));
+  if (cls.IsNull()) {
+    const String& msg = String::Handle(String::NewFormatted(
+          "Unable to resolve class '%s' in library '%s'.",
+          class_name(), (library_url() ? library_url() : script_url())));

[Ivan Posva, 2013/11/12 07:19:49]

I know this was already bad in the original code, but a char* is not a boolean.
Please change to "(library_url() != NULL) ? library_url() : script_url()".

[Lasse Reichstein Nielsen, 2013/11/12 07:28:51]

Done.

+    return LanguageError::New(msg);
+  }
+  const Function& func =
+      Function::Handle(cls.LookupStaticFunctionAllowPrivate(func_name));
   if (func.IsNull()) {
     const String& msg = String::Handle(String::NewFormatted(
-        "Unable to resolve function '%s' in library '%s'.",
-        function_name(), (library_url() ? library_url() : script_url())));
+          "Unable to resolve static method '%s.%s' in library '%s'.",
+          class_name(), function_name(),
+          (library_url() ? library_url() : script_url())));

[Ivan Posva, 2013/11/12 07:19:49]

ditto

[Lasse Reichstein Nielsen, 2013/11/12 07:28:51]

Done.

     return LanguageError::New(msg);
   }
   return func.raw();
 }
 
 
 void IsolateSpawnState::Cleanup() {
   SwitchIsolateScope switch_scope(isolate());
   Dart::ShutdownIsolate();
 }
 
 }  // namespace dart