Revert revision 39617 "Create isolates in a separate thread."

runtime/lib/isolate_patch.dart

 // 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.
 
 import "dart:collection" show HashMap;
 
 patch class ReceivePort {
   /* patch */ factory ReceivePort() = _ReceivePortImpl;
 
   /* patch */ factory ReceivePort.fromRawReceivePort(RawReceivePort rawPort) =
@@ skipping 235 matching lines @@
 
 patch class Isolate {
   /* patch */ static Future<Isolate> spawn(
       void entryPoint(message), var message, { bool paused: false }) {
     // `paused` isn't handled yet.
     RawReceivePort readyPort;
     try {
       // The VM will invoke [_startIsolate] with entryPoint as argument.
       readyPort = new RawReceivePort();
       _spawnFunction(readyPort.sendPort, entryPoint, message);
-      return spawnCommon(readyPort);
+      Completer completer = new Completer<Isolate>.sync();
+      readyPort.handler = (readyMessage) {
+        readyPort.close();
+        assert(readyMessage is List);
+        assert(readyMessage.length == 2);
+        SendPort controlPort = readyMessage[0];
+        List capabilities = readyMessage[1];
+        completer.complete(new Isolate(controlPort,
+                                       pauseCapability: capabilities[0],
+                                       terminateCapability: capabilities[1]));
+      };
+      return completer.future;
     } catch (e, st) {
       if (readyPort != null) {
         readyPort.close();
       }
       return new Future<Isolate>.error(e, st);
     };
   }
 
   /* patch */ static Future<Isolate> spawnUri(
       Uri uri, List<String> args, var message, { bool paused: false }) {
     // `paused` isn't handled yet.
     RawReceivePort readyPort;
     try {
       // The VM will invoke [_startIsolate] and not `main`.
       readyPort = new RawReceivePort();
       _spawnUri(readyPort.sendPort, uri.toString(), args, message);
-      return spawnCommon(readyPort);
+      Completer completer = new Completer<Isolate>.sync();
+      readyPort.handler = (readyMessage) {
+        readyPort.close();
+        assert(readyMessage is List);
+        assert(readyMessage.length == 2);
+        SendPort controlPort = readyMessage[0];
+        List capabilities = readyMessage[1];
+        completer.complete(new Isolate(controlPort,
+                                       pauseCapability: capabilities[0],
+                                       terminateCapability: capabilities[1]));
+      };
+      return completer.future;
     } catch (e, st) {
       if (readyPort != null) {
         readyPort.close();
       }
       return new Future<Isolate>.error(e, st);
     };
-  }
-
-  static Future<Isolate> spawnCommon(RawReceivePort readyPort) {
-    Completer completer = new Completer<Isolate>.sync();
-    readyPort.handler = (readyMessage) {
-      readyPort.close();
-      if (readyMessage is String) {
-        // We encountered an error starting the new isolate.
-        completer.completeError(new IsolateSpawnException(
-            "Unable to spawn child isolate:\n${readyMessage}"));
-      } else if (readyMessage is List &&
-            readyMessage.length == 2) {
-        SendPort controlPort = readyMessage[0];
-        List capabilities = readyMessage[1];
-        completer.complete(new Isolate(controlPort,
-                                       pauseCapability: capabilities[0],
-                                       terminateCapability: capabilities[1]));
-      } else {
-        completer.completeError(new IsolateSpawnException(
-            "Internal error: received unexpected message $readyMessage"));
-      }
-    };
     return completer.future;
   }
 
   // TODO(iposva): Cleanup to have only one definition.
   // These values need to be kept in sync with the class IsolateMessageHandler
   // in vm/isolate.cc.
   static const _PAUSE = 1;
   static const _RESUME = 2;
 
   static SendPort _spawnFunction(SendPort readyPort, Function topLevelFunction,
@@ skipping 45 matching lines @@
   }
 
   /* patch */ void addErrorListener(SendPort port) {
     throw new UnsupportedError("addErrorListener");
   }
 
   /* patch */ void removeErrorListener(SendPort port) {
     throw new UnsupportedError("removeErrorListener");
   }
 }