Changelist to land https://codereview.chromium.org/13452007/ for Siva.

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 409 matching lines @@
 
   return Dart_SetField(runtime_options_class, native_name, dart_arguments);
 }
 
 
 #define CHECK_RESULT(result)                                                   \
   if (Dart_IsError(result)) {                                                  \
     *error = strdup(Dart_GetError(result));                                    \
     Dart_ExitScope();                                                          \
     Dart_ShutdownIsolate();                                                    \
-    return false;                                                              \
+    return NULL;                                                               \
   }                                                                            \
 
 
 // Returns true on success, false on failure.
-static bool CreateIsolateAndSetupHelper(const char* script_uri,
-                                        const char* main,
-                                        void* data,
-                                        char** error) {
+static Dart_Isolate CreateIsolateAndSetupHelper(const char* script_uri,
+                                                const char* main,
+                                                void* data,
+                                                char** error) {
   Dart_Isolate isolate =
       Dart_CreateIsolate(script_uri, main, snapshot_buffer, data, error);
   if (isolate == NULL) {
-    return false;
+    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 21 matching lines @@
   Dart_Handle library = DartUtils::LoadScript(script_uri, builtin_lib);
   CHECK_RESULT(library);
   if (!Dart_IsLibrary(library)) {
     char errbuf[256];
     snprintf(errbuf, sizeof(errbuf),
              "Expected a library when loading script: %s",
              script_uri);
     *error = strdup(errbuf);
     Dart_ExitScope();
     Dart_ShutdownIsolate();
-    return false;
+    return NULL;
   }
+
+  // Make the isolate runnable so that it is ready to handle messages.
   Dart_ExitScope();
+  Dart_ExitIsolate();
+  bool retval = Dart_IsolateMakeRunnable(isolate);
+  if (!retval) {
+    *error = strdup("Invalid isolate state - Unable to make it runnable");
+    Dart_EnterIsolate(isolate);
+    Dart_ShutdownIsolate();
+    return NULL;
+  }
+
   VmStats::AddIsolate(reinterpret_cast<IsolateData*>(data), isolate);
-  return true;
+  return isolate;
 }
 
 
-static bool CreateIsolateAndSetup(const char* script_uri,
-                                  const char* main,
-                                  void* data, char** error) {
+static Dart_Isolate CreateIsolateAndSetup(const char* script_uri,
+                                          const char* main,
+                                          void* data, char** error) {
   return CreateIsolateAndSetupHelper(script_uri,
                                      main,
                                      new IsolateData(),
                                      error);
 }
 
 
 static void PrintVersion() {
   Log::PrintErr("Dart VM version: %s\n", Dart_VersionString());
 }
@@ skipping 232 matching lines @@
     DebuggerConnectionHandler::StartHandler(debug_ip, debug_port);
     if (verbose_debug_seen) {
       Log::Print("Debugger initialized\n");
     }
   }
 
   // Call CreateIsolateAndSetup which creates an isolate and loads up
   // the specified application script.
   char* error = NULL;
   char* isolate_name = BuildIsolateName(script_name, "main");
-  if (!CreateIsolateAndSetupHelper(script_name,
-                                   "main",
-                                   new IsolateData(),
-                                   &error)) {
+  Dart_Isolate isolate = CreateIsolateAndSetupHelper(script_name,
+                                                     "main",
+                                                     new IsolateData(),
+                                                     &error);
+  if (isolate == NULL) {
     Log::PrintErr("%s\n", error);
     free(error);
     delete [] isolate_name;
     return kErrorExitCode;  // Indicates we encountered an error.
   }
   delete [] isolate_name;
 
-  Dart_Isolate isolate = Dart_CurrentIsolate();
+  Dart_EnterIsolate(isolate);
+  ASSERT(isolate == Dart_CurrentIsolate());
   ASSERT(isolate != NULL);
   Dart_Handle result;
 
   Dart_EnterScope();
 
   if (vmstats_port >= 0) {
     VmStats::Start(vmstats_port, vmstats_root);
   }
 
   if (generate_script_snapshot) {
@@ skipping 72 matching lines @@
   Dart_ShutdownIsolate();
   // Terminate process exit-code handler.
   Process::TerminateExitCodeHandler();
   // Free copied argument strings if converted.
   if (argv_converted) {
     for (int i = 0; i < argc; i++) free(argv[i]);
   }
 
   return Process::GlobalExitCode();
 }