Revert "Per isolate package root."

runtime/bin/main.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 <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
@@ skipping 36 matching lines @@
 // and listen for a debugger to connect.
 static bool start_debugger = false;
 static const char* debug_ip = NULL;
 static int debug_port = -1;
 static const char* DEFAULT_DEBUG_IP = "127.0.0.1";
 static const int DEFAULT_DEBUG_PORT = 5858;
 
 // Value of the --package-root flag.
 // (This pointer points into an argv buffer and does not need to be
 // free'd.)
-static const char* commandline_package_root = NULL;
+static const char* package_root = NULL;
 
 
 // Global flag that is used to indicate that we want to compile all the
 // dart functions and not run anything.
 static bool has_compile_all = false;
 
 // Global flag that is used to indicate that we want to print the source code
 // for script that is being run.
 static bool has_print_script = false;
 
@@ skipping 61 matching lines @@
   return true;
 }
 
 
 static bool ProcessPackageRootOption(const char* arg,
                                      CommandLineOptions* vm_options) {
   ASSERT(arg != NULL);
   if (*arg == '\0' || *arg == '-') {
     return false;
   }
-  commandline_package_root = arg;
+  package_root = arg;
   return true;
 }
 
 
 static void* GetHashmapKeyFromString(char* key) {
   return reinterpret_cast<void*>(key);
 }
 
 
 static bool ExtractPortAndIP(const char *option_value,
@@ skipping 392 matching lines @@
     *error = strdup(Dart_GetError(result));                                    \
     *is_compile_error = Dart_IsCompilationError(result);                       \
     Dart_ExitScope();                                                          \
     Dart_ShutdownIsolate();                                                    \
     return NULL;                                                               \
   }                                                                            \
 
 // Returns true on success, false on failure.
 static Dart_Isolate CreateIsolateAndSetupHelper(const char* script_uri,
                                                 const char* main,
-                                                const char* package_root,
+                                                void* data,
                                                 char** error,
                                                 bool* is_compile_error) {
-  ASSERT(script_uri != NULL);
-  IsolateData* isolate_data = new IsolateData(script_uri, package_root);
-  Dart_Isolate isolate = Dart_CreateIsolate(
-      script_uri, main, snapshot_buffer, isolate_data, error);
+  Dart_Isolate isolate =
+      Dart_CreateIsolate(script_uri, main, snapshot_buffer, data, error);
   if (isolate == NULL) {
     return NULL;
   }
 
   Dart_EnterScope();
 
   if (snapshot_buffer != NULL) {
     // Setup the native resolver as the snapshot does not carry it.
     Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
     Builtin::SetNativeResolver(Builtin::kIOLibrary);
@@ skipping 13 matching lines @@
   // available here in the case of script snapshot loading.
   Dart_Handle builtin_lib =
       Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
   CHECK_RESULT(builtin_lib);
 
   // Prepare for script loading by setting up the 'print' and 'timer'
   // closures and setting up 'package root' for URI resolution.
   result = DartUtils::PrepareForScriptLoading(package_root, builtin_lib);
   CHECK_RESULT(result);
 
-  result = DartUtils::LoadScript(script_uri, builtin_lib);
+  IsolateData* isolate_data = reinterpret_cast<IsolateData*>(data);
+  ASSERT(isolate_data != NULL);
+  ASSERT(isolate_data->script_url != NULL);
+  result = DartUtils::LoadScript(isolate_data->script_url, builtin_lib);
   CHECK_RESULT(result);
 
   // Run event-loop and wait for script loading to complete.
   result = Dart_RunLoop();
   CHECK_RESULT(result);
 
   Platform::SetPackageRoot(package_root);
   Dart_Handle io_lib_url = DartUtils::NewString(DartUtils::kIOLibURL);
   CHECK_RESULT(io_lib_url);
   Dart_Handle io_lib = Dart_LookupLibrary(io_lib_url);
@@ skipping 20 matching lines @@
     return NULL;
   }
 
   return isolate;
 }
 
 #undef CHECK_RESULT
 
 static Dart_Isolate CreateIsolateAndSetup(const char* script_uri,
                                           const char* main,
-                                          const char* package_root,
                                           void* data, char** error) {
-  IsolateData* parent_isolate_data = reinterpret_cast<IsolateData*>(data);
   bool is_compile_error = false;
   if (script_uri == NULL) {
     if (data == NULL) {
       *error = strdup("Invalid 'callback_data' - Unable to spawn new isolate");
       return NULL;
     }
+    IsolateData* parent_isolate_data = reinterpret_cast<IsolateData*>(data);
     script_uri = parent_isolate_data->script_url;
     if (script_uri == NULL) {
       *error = strdup("Invalid 'callback_data' - Unable to spawn new isolate");
       return NULL;
     }
   }
-  if (package_root == NULL) {
-    package_root = parent_isolate_data->package_root;
-  }
+  IsolateData* isolate_data = new IsolateData(script_uri);
   return CreateIsolateAndSetupHelper(script_uri,
                                      main,
-                                     package_root,
+                                     isolate_data,
                                      error,
                                      &is_compile_error);
 }
 
 
 #define CHECK_RESULT(result)                                                   \
   if (Dart_IsError(result)) {                                                  \
     *error = strdup(Dart_GetError(result));                                    \
     Dart_ExitScope();                                                          \
     Dart_ShutdownIsolate();                                                    \
     return NULL;                                                               \
   }                                                                            \
 
 static Dart_Isolate CreateServiceIsolate(void* data, char** error) {
   const char* script_uri = DartUtils::kVMServiceLibURL;
-  IsolateData* isolate_data = new IsolateData(script_uri, NULL);
+  IsolateData* isolate_data = new IsolateData(script_uri);
   Dart_Isolate isolate =
       Dart_CreateIsolate(script_uri, "main", snapshot_buffer, isolate_data,
                          error);
   if (isolate == NULL) {
     return NULL;
   }
   Dart_EnterScope();
   if (snapshot_buffer != NULL) {
     // Setup the native resolver as the snapshot does not carry it.
     Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
     Builtin::SetNativeResolver(Builtin::kIOLibrary);
   }
   // Set up the library tag handler for this isolate.
   Dart_Handle result = Dart_SetLibraryTagHandler(DartUtils::LibraryTagHandler);
   CHECK_RESULT(result);
   result = Dart_SetEnvironmentCallback(EnvironmentCallback);
   CHECK_RESULT(result);
   // Prepare builtin and its dependent libraries for use to resolve URIs.
   Dart_Handle builtin_lib =
       Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
   CHECK_RESULT(builtin_lib);
   // Prepare for script loading by setting up the 'print' and 'timer'
   // closures and setting up 'package root' for URI resolution.
-  result = DartUtils::PrepareForScriptLoading(NULL, builtin_lib);
+  result = DartUtils::PrepareForScriptLoading(package_root, builtin_lib);
   CHECK_RESULT(result);
 
   Dart_ExitScope();
   Dart_ExitIsolate();
   return isolate;
 }
 
 #undef CHECK_RESULT
 
 static void PrintVersion() {
@@ skipping 316 matching lines @@
     Dart_RegisterIsolateServiceRequestCallback(
         "io", &ServiceRequestHandler, NULL);
   }
   ASSERT(Dart_CurrentIsolate() == NULL);
 
   // Call CreateIsolateAndSetup which creates an isolate and loads up
   // the specified application script.
   char* error = NULL;
   bool is_compile_error = false;
   char* isolate_name = BuildIsolateName(script_name, "main");
+  IsolateData* isolate_data = new IsolateData(script_name);
   Dart_Isolate isolate = CreateIsolateAndSetupHelper(script_name,
                                                      "main",
-                                                     commandline_package_root,
+                                                     isolate_data,
                                                      &error,
                                                      &is_compile_error);
   if (isolate == NULL) {
     Log::PrintErr("%s\n", error);
     free(error);
     delete [] isolate_name;
     exit(is_compile_error ? kCompilationErrorExitCode : kErrorExitCode);
   }
   delete [] isolate_name;
 
@@ skipping 117 matching lines @@
   exit(Process::GlobalExitCode());
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   dart::bin::main(argc, argv);
   UNREACHABLE();
 }