Revert r43217, r43215, r43208, r43207, and r43202.

runtime/bin/dartutils.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 "bin/dartutils.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "platform/globals.h"
 
 #include "bin/crypto.h"
 #include "bin/directory.h"
 #include "bin/extensions.h"
 #include "bin/file.h"
 #include "bin/io_buffer.h"
-#include "bin/platform.h"
 #include "bin/socket.h"
 #include "bin/utils.h"
 
 namespace dart {
 namespace bin {
 
 const char* DartUtils::original_working_directory = NULL;
 const char* DartUtils::kDartScheme = "dart:";
 const char* DartUtils::kDartExtensionScheme = "dart-ext:";
 const char* DartUtils::kAsyncLibURL = "dart:async";
@@ skipping 442 matching lines @@
 void DartUtils::WriteMagicNumber(File* file) {
   // Write a magic number and version information into the snapshot file.
   bool bytes_written = file->WriteFully(magic_number, sizeof(magic_number));
   ASSERT(bytes_written);
 }
 
 
 Dart_Handle DartUtils::LoadScript(const char* script_uri,
                                   Dart_Handle builtin_lib) {
   Dart_Handle uri = Dart_NewStringFromCString(script_uri);
-
-  Dart_Port load_port = Dart_ServiceWaitForLoadPort();
-  if (load_port == ILLEGAL_PORT) {
-    return NewDartUnsupportedError("Service did not return load port.");
-  }
-  Builtin::SetLoadPort(load_port);
-
   return LoadDataAsync_Invoke(Dart_Null(), uri, Dart_Null(), builtin_lib);
 }
 
 
 // Callback function, gets called from asynchronous script and library
 // reading code when there is an i/o error.
 void FUNCTION_NAME(Builtin_AsyncLoadError)(Dart_NativeArguments args) {
   //  Dart_Handle source_uri = Dart_GetNativeArgument(args, 0);
   Dart_Handle library_uri = Dart_GetNativeArgument(args, 1);
   Dart_Handle error = Dart_GetNativeArgument(args, 2);
@@ skipping 93 matching lines @@
   Dart_Handle res = Dart_FinalizeLoading(true);
   if (Dart_IsError(res)) {
     // TODO(hausner): If compilation/loading errors are supposed to
     // be observable by the program, we need to mark the bad library
     // with the error instead of propagating it.
     Dart_PropagateError(res);
   }
 }
 
 
-void FUNCTION_NAME(Builtin_NativeLibraryExtension)(Dart_NativeArguments args) {
-  const char* suffix = Platform::LibraryExtension();
-  ASSERT(suffix != NULL);
-  Dart_Handle res = Dart_NewStringFromCString(suffix);
-  if (Dart_IsError(res)) {
-    Dart_PropagateError(res);
-  }
-  Dart_SetReturnValue(args, res);
-}
-
-
-void DartUtils::PrepareBuiltinLibrary(Dart_Handle builtin_lib,
-                                      const char* package_root) {
-  Dart_Handle url = NewString(kInternalLibURL);
-  DART_CHECK_VALID(url);
-  Dart_Handle internal_lib = Dart_LookupLibrary(url);
-  DART_CHECK_VALID(internal_lib);
-
-  // Setup the internal library's 'internalPrint' function.
-  Dart_Handle print = Dart_Invoke(
-      builtin_lib, NewString("_getPrintClosure"), 0, NULL);
-  DART_CHECK_VALID(print);
-  Dart_Handle result =
-      Dart_SetField(internal_lib, NewString("_printClosure"), print);
-  DART_CHECK_VALID(result);
-
-  if (IsWindowsHost()) {
-    // Set running on Windows flag.
-    result = Dart_Invoke(builtin_lib, NewString("_setWindows"), 0, NULL);
-    DART_CHECK_VALID(result);
-  }
-
-  // Set current working directory.
-  result = SetWorkingDirectory(builtin_lib);
-  DART_CHECK_VALID(result);
-
-  // Set up package root if specified.
-  if (package_root != NULL) {
-    result = NewString(package_root);
-    DART_CHECK_VALID(result);
-    const int kNumArgs = 1;
-    Dart_Handle dart_args[kNumArgs];
-    dart_args[0] = result;
-    result = Dart_Invoke(builtin_lib,
-                         NewString("_setPackageRoot"),
-                         kNumArgs,
-                         dart_args);
-    DART_CHECK_VALID(result);
-  }
-}
-
-
-void DartUtils::PrepareCoreLibrary(Dart_Handle builtin_lib) {
-  Dart_Handle url = NewString(kCoreLibURL);
-  DART_CHECK_VALID(url);
-  Dart_Handle core_lib = Dart_LookupLibrary(url);
-  DART_CHECK_VALID(core_lib);
-
-  // Setup the 'Uri.base' getter in dart:core.
-  Dart_Handle uri_base = Dart_Invoke(
-      builtin_lib, NewString("_getUriBaseClosure"), 0, NULL);
-  DART_CHECK_VALID(uri_base);
-  Dart_Handle result = Dart_SetField(core_lib,
-                                     NewString("_uriBaseClosure"),
-                                     uri_base);
-  DART_CHECK_VALID(result);
-}
-
-
-void DartUtils::PrepareAsyncLibrary(Dart_Handle async_lib,
-                                    Dart_Handle io_lib) {
-  Dart_Handle url = NewString(kIsolateLibURL);
-  DART_CHECK_VALID(url);
-  Dart_Handle isolate_lib = Dart_LookupLibrary(url);
-  DART_CHECK_VALID(isolate_lib);
-
-  // Setup the 'timer' factory in dart:async.
-  Dart_Handle timer_closure =
-      Dart_Invoke(io_lib, NewString("_getTimerFactoryClosure"), 0, NULL);
-  DART_CHECK_VALID(timer_closure);
-  Dart_Handle args[1];
-  args[0] = timer_closure;
-  DART_CHECK_VALID(Dart_Invoke(
-      async_lib, NewString("_setTimerFactoryClosure"), 1, args));
-
-  // Setup the 'scheduleImmediate' closure in dart:async.
-  Dart_Handle schedule_immediate_closure =
-      Dart_Invoke(isolate_lib, NewString("_getIsolateScheduleImmediateClosure"),
-                  0, NULL);
-  args[0] = schedule_immediate_closure;
-  DART_CHECK_VALID(Dart_Invoke(
-      async_lib, NewString("_setScheduleImmediateClosure"), 1, args));
-}
-
-
 Dart_Handle DartUtils::PrepareForScriptLoading(const char* package_root,
                                                Dart_Handle builtin_lib) {
   // First ensure all required libraries are available.
   Dart_Handle url = NewString(kAsyncLibURL);
   DART_CHECK_VALID(url);
   Dart_Handle async_lib = Dart_LookupLibrary(url);
   DART_CHECK_VALID(async_lib);
   Dart_Handle io_lib = Builtin::LoadAndCheckLibrary(Builtin::kIOLibrary);
 
   // We need to ensure that all the scripts loaded so far are finalized
   // as we are about to invoke some Dart code below to setup closures.
   Dart_Handle result = Dart_FinalizeLoading(false);
   DART_CHECK_VALID(result);
 
-  PrepareBuiltinLibrary(builtin_lib, package_root);
-  PrepareAsyncLibrary(async_lib, io_lib);
-  PrepareCoreLibrary(builtin_lib);
+  // Setup the internal library's 'internalPrint' function.
+  Dart_Handle print = Dart_Invoke(
+      builtin_lib, NewString("_getPrintClosure"), 0, NULL);
+  url = NewString(kInternalLibURL);
+  DART_CHECK_VALID(url);
+  Dart_Handle internal_lib = Dart_LookupLibrary(url);
+  DART_CHECK_VALID(internal_lib);
+  result = Dart_SetField(internal_lib,
+                         NewString("_printClosure"),
+                         print);
+  DART_CHECK_VALID(result);
 
+  // Setup the 'timer' factory.
+  Dart_Handle timer_closure =
+      Dart_Invoke(io_lib, NewString("_getTimerFactoryClosure"), 0, NULL);
+  Dart_Handle args[1];
+  args[0] = timer_closure;
+  DART_CHECK_VALID(Dart_Invoke(
+      async_lib, NewString("_setTimerFactoryClosure"), 1, args));
+
+  // Setup the 'scheduleImmediate' closure.
+  url = NewString(kIsolateLibURL);
+  DART_CHECK_VALID(url);
+  Dart_Handle isolate_lib = Dart_LookupLibrary(url);
+  DART_CHECK_VALID(isolate_lib);
+  Dart_Handle schedule_immediate_closure =
+      Dart_Invoke(isolate_lib, NewString("_getIsolateScheduleImmediateClosure"),
+                  0, NULL);
+  args[0] = schedule_immediate_closure;
+  DART_CHECK_VALID(Dart_Invoke(
+      async_lib, NewString("_setScheduleImmediateClosure"), 1, args));
+
+  // Setup the corelib 'Uri.base' getter.
+  url = NewString(kCoreLibURL);
+  DART_CHECK_VALID(url);
+  Dart_Handle corelib = Dart_LookupLibrary(url);
+  DART_CHECK_VALID(corelib);
+  Dart_Handle uri_base = Dart_Invoke(
+      builtin_lib, NewString("_getUriBaseClosure"), 0, NULL);
+  DART_CHECK_VALID(uri_base);
+  result = Dart_SetField(corelib,
+                         NewString("_uriBaseClosure"),
+                         uri_base);
+  DART_CHECK_VALID(result);
+
+  if (IsWindowsHost()) {
+    // Set running on Windows flag.
+    result = Dart_Invoke(builtin_lib, NewString("_setWindows"), 0, NULL);
+    if (Dart_IsError(result)) {
+      return result;
+    }
+  }
+
+  // Set current working directory.
+  result = SetWorkingDirectory(builtin_lib);
+  if (Dart_IsError(result)) {
+    return result;
+  }
+
+  // Set up package root if specified.
+  if (package_root != NULL) {
+    result = NewString(package_root);
+    if (!Dart_IsError(result)) {
+      const int kNumArgs = 1;
+      Dart_Handle dart_args[kNumArgs];
+      dart_args[0] = result;
+      return Dart_Invoke(builtin_lib,
+                         NewString("_setPackageRoot"),
+                         kNumArgs,
+                         dart_args);
+    }
+  }
   return result;
 }
 
 
-void DartUtils::SetupIOLibrary(const char* script_uri) {
-  Dart_Handle io_lib_url = NewString(kIOLibURL);
-  DART_CHECK_VALID(io_lib_url);
-  Dart_Handle io_lib = Dart_LookupLibrary(io_lib_url);
-  DART_CHECK_VALID(io_lib);
-  Dart_Handle platform_type = GetDartType(DartUtils::kIOLibURL, "_Platform");
-  DART_CHECK_VALID(platform_type);
-  Dart_Handle script_name = NewString("_nativeScript");
-  DART_CHECK_VALID(script_name);
-  Dart_Handle dart_script = NewString(script_uri);
-  DART_CHECK_VALID(dart_script);
-  Dart_Handle set_script_name =
-      Dart_SetField(platform_type, script_name, dart_script);
-  DART_CHECK_VALID(set_script_name);
-}
-
-
 bool DartUtils::PostNull(Dart_Port port_id) {
   // Post a message with just the null object.
   return Dart_PostCObject(port_id, CObject::Null()->AsApiCObject());
 }
 
 
 bool DartUtils::PostInt32(Dart_Port port_id, int32_t value) {
   // Post a message with the integer value.
   int32_t min = 0xc0000000;  // -1073741824
   int32_t max = 0x3fffffff;  // 1073741823
@@ skipping 69 matching lines @@
 }
 
 
 Dart_Handle DartUtils::NewDartArgumentError(const char* message) {
   return NewDartExceptionWithMessage(kCoreLibURL,
                                      "ArgumentError",
                                      message);
 }
 
 
-Dart_Handle DartUtils::NewDartUnsupportedError(const char* message) {
-  return NewDartExceptionWithMessage(kCoreLibURL,
-                                     "UnsupportedError",
-                                     message);
-}
-
-
 Dart_Handle DartUtils::NewDartIOException(const char* exception_name,
                                           const char* message,
                                           Dart_Handle os_error) {
   // Create a dart:io exception object of the given type.
   return NewDartExceptionWithOSError(kIOLibURL,
                                      exception_name,
                                      message,
                                      os_error);
 }
 
@@ skipping 329 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart