Revert my last change.

runtime/vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 613 matching lines @@
   if (Flags::Lookup(flag_name) != NULL) {
     return true;
   }
   return false;
 }
 
 
 // --- Isolates ---
 
 
-static char* BuildIsolateName(const char* script_uri,
-                              const char* main) {
-  if (script_uri == NULL) {
-    // Just use the main as the name.
-    if (main == NULL) {
-      return strdup("isolate");
-    } else {
-      return strdup(main);
-    }
-  }
-
-  // Skip past any slashes and backslashes in the script uri.
-  const char* last_slash = strrchr(script_uri, '/');
-  if (last_slash != NULL) {
-    script_uri = last_slash + 1;
-  }
-  const char* last_backslash = strrchr(script_uri, '\\');
-  if (last_backslash != NULL) {
-    script_uri = last_backslash + 1;
-  }
-  if (main == NULL) {
-    main = "main";
-  }
-
-  char* chars = NULL;
-  intptr_t len = OS::SNPrint(NULL, 0, "%s/%s", script_uri, main) + 1;
-  chars = reinterpret_cast<char*>(malloc(len));
-  OS::SNPrint(chars, len, "%s/%s", script_uri, main);
-  return chars;
-}
-
-
-DART_EXPORT Dart_Isolate Dart_CreateIsolate(const char* script_uri,
-                                            const char* main,
+DART_EXPORT Dart_Isolate Dart_CreateIsolate(const char* name_prefix,
                                             const uint8_t* snapshot,
                                             void* callback_data,
                                             char** error) {
-  char* isolate_name = BuildIsolateName(script_uri, main);
-  Isolate* isolate = Dart::CreateIsolate(isolate_name);
-  free(isolate_name);
+  Isolate* isolate = Dart::CreateIsolate(name_prefix);
   {
     DARTSCOPE_NOCHECKS(isolate);
     const Error& error_obj =
         Error::Handle(isolate,
                       Dart::InitializeIsolate(snapshot, callback_data));
     if (error_obj.IsNull()) {
       START_TIMER(time_total_runtime);
       return reinterpret_cast<Dart_Isolate>(isolate);
     }
     *error = strdup(error_obj.ToErrorCString());
@@ skipping 2304 matching lines @@
 
 DART_EXPORT Dart_Handle Dart_SetLibraryTagHandler(
     Dart_LibraryTagHandler handler) {
   Isolate* isolate = Isolate::Current();
   CHECK_ISOLATE(isolate);
   isolate->set_library_tag_handler(handler);
   return Api::Success(isolate);
 }
 
 
-DART_EXPORT Dart_Handle Dart_SetImportMap(Dart_Handle import_map) {
-  Isolate* isolate = Isolate::Current();
-  DARTSCOPE(isolate);
-  const Array& mapping_array = Api::UnwrapArrayHandle(isolate, import_map);
-  if (mapping_array.IsNull()) {
-    RETURN_TYPE_ERROR(isolate, import_map, Array);
-  }
-  isolate->object_store()->set_import_map(mapping_array);
-  return Api::Success(isolate);
-}
-
-
 // NOTE: Need to pass 'result' as a parameter here in order to avoid
 // warning: variable 'result' might be clobbered by 'longjmp' or 'vfork'
 // which shows up because of the use of setjmp.
 static void CompileSource(Isolate* isolate,
                           const Library& lib,
                           const String& url,
                           const String& source,
                           RawScript::Kind kind,
                           Dart_Handle* result) {
   bool update_lib_status = (kind == RawScript::kScript ||
@@ skipping 13 matching lines @@
   } else {
     *result = Api::NewHandle(isolate, error.raw());
     if (update_lib_status) {
       lib.SetLoadError();
     }
   }
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadScript(Dart_Handle url,
-                                        Dart_Handle source) {
+                                        Dart_Handle source,
+                                        Dart_Handle import_map) {
   TIMERSCOPE(time_script_loading);
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const String& url_str = Api::UnwrapStringHandle(isolate, url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, url, String);
   }
   const String& source_str = Api::UnwrapStringHandle(isolate, source);
   if (source_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, source, String);
   }
+  const Array& mapping_array = Api::UnwrapArrayHandle(isolate, import_map);
   Library& library =
       Library::Handle(isolate, isolate->object_store()->root_library());
   if (!library.IsNull()) {
     const String& library_url = String::Handle(isolate, library.url());
     return Api::NewError("%s: A script has already been loaded from '%s'.",
                          CURRENT_FUNC, library_url.ToCString());
   }
   library = Library::New(url_str);
+  if (mapping_array.IsNull()) {
+    library.set_import_map(Array::Handle(isolate, Array::Empty()));
+  } else {
+    library.set_import_map(mapping_array);
+  }
   library.Register();
   isolate->object_store()->set_root_library(library);
   Dart_Handle result;
   CompileSource(isolate,
                 library,
                 url_str,
                 source_str,
                 RawScript::kScript,
                 &result);
   return result;
@@ skipping 25 matching lines @@
   if (!tmp.IsLibrary()) {
     return Api::NewError("%s: Unable to deserialize snapshot correctly.",
                          CURRENT_FUNC);
   }
   library ^= tmp.raw();
   isolate->object_store()->set_root_library(library);
   return Api::NewHandle(isolate, library.raw());
 }
 
 
-DART_EXPORT Dart_Handle Dart_RootLibrary() {
-  Isolate* isolate = Isolate::Current();
-  DARTSCOPE(isolate);
-  Library& library =
-      Library::Handle(isolate, isolate->object_store()->root_library());
-  return Api::NewHandle(isolate, library.raw());
-}
-
-
 static void CompileAll(Isolate* isolate, Dart_Handle* result) {
   ASSERT(isolate != NULL);
   const Error& error = Error::Handle(isolate, Library::CompileAll());
   if (error.IsNull()) {
     *result = Api::Success(isolate);
   } else {
     *result = Api::NewHandle(isolate, error.raw());
   }
 }
 
@@ skipping 65 matching lines @@
   if (library.IsNull()) {
     return Api::NewError("%s: library '%s' not found.",
                          CURRENT_FUNC, url_str.ToCString());
   } else {
     return Api::NewHandle(isolate, library.raw());
   }
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadLibrary(Dart_Handle url,
-                                         Dart_Handle source) {
+                                         Dart_Handle source,
+                                         Dart_Handle import_map) {
   TIMERSCOPE(time_script_loading);
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const String& url_str = Api::UnwrapStringHandle(isolate, url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, url, String);
   }
   const String& source_str = Api::UnwrapStringHandle(isolate, source);
   if (source_str.IsNull()) {
     RETURN_TYPE_ERROR(isolate, source, String);
   }
+  const Array& mapping_array = Api::UnwrapArrayHandle(isolate, import_map);
   Library& library = Library::Handle(isolate, Library::LookupLibrary(url_str));
   if (library.IsNull()) {
     library = Library::New(url_str);
+    if (mapping_array.IsNull()) {
+      library.set_import_map(Array::Handle(isolate, Array::Empty()));
+    } else {
+      library.set_import_map(mapping_array);
+    }
     library.Register();
   } else if (!library.LoadNotStarted()) {
     // The source for this library has either been loaded or is in the
     // process of loading.  Return an error.
     return Api::NewError("%s: library '%s' has already been loaded.",
                          CURRENT_FUNC, url_str.ToCString());
   }
   Dart_Handle result;
   CompileSource(isolate,
                 library,
@@ skipping 98 matching lines @@
       *buffer = NULL;
     }
     delete debug_region;
   } else {
     *buffer = NULL;
     *buffer_size = 0;
   }
 }
 
 }  // namespace dart