Fix http://dartbug.com/22115

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 "vm/code_observers.h"
@@ skipping 1551 matching lines @@
   free(package_root_);
   free(library_url_);
   free(function_name_);
   free(class_name_);
   free(serialized_args_);
   free(serialized_message_);
 }
 
 
 RawObject* IsolateSpawnState::ResolveFunction() {
-  // Resolve the library.
-  Library& lib = Library::Handle();
-  if (library_url()) {
-    const String& lib_url = String::Handle(String::New(library_url()));
-    lib = Library::LookupLibrary(lib_url);
-    if (lib.IsNull() || lib.IsError()) {
+  const String& func_name = String::Handle(String::New(function_name()));
+
+  if (library_url() == NULL) {
+    // Handle spawnUri lookup rules.
+    // Check whether the root library defines a main function.
+    const Library& lib = Library::Handle(I->object_store()->root_library());
+    Function& func = Function::Handle(lib.LookupLocalFunction(func_name));
+    if (func.IsNull()) {
+      // Check whether main is reexported from the root library.
+      const Object& obj = Object::Handle(lib.LookupReExport(func_name));
+      if (obj.IsFunction()) {
+        func ^= obj.raw();
+      }
+    }
+    if (func.IsNull()) {
       const String& msg = String::Handle(String::NewFormatted(
-          "Unable to find library '%s'.", library_url()));
+          "Unable to resolve function '%s' in script '%s'.",
+          function_name(), script_url()));
       return LanguageError::New(msg);
     }
-  } else {
-    lib = I->object_store()->root_library();
+    return func.raw();
   }
-  ASSERT(!lib.IsNull());
+
+  ASSERT(script_url() == NULL);
+  // Resolve the library.
+  const String& lib_url = String::Handle(String::New(library_url()));
+  const Library& lib = Library::Handle(Library::LookupLibrary(lib_url));
+  if (lib.IsNull() || lib.IsError()) {
+    const String& msg = String::Handle(String::NewFormatted(
+        "Unable to find library '%s'.", library_url()));
+    return LanguageError::New(msg);
+  }
 
   // Resolve the function.
-  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() != NULL ? library_url() : script_url())));
+          function_name(), library_url()));
       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'.",
@@ skipping 24 matching lines @@
                            serialized_message_, serialized_message_len_);
 }
 
 
 void IsolateSpawnState::Cleanup() {
   SwitchIsolateScope switch_scope(I);
   Dart::ShutdownIsolate();
 }
 
 }  // namespace dart