Fix VM exit code in some cases.

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 389 matching lines @@
     return native_name;
   }
 
   return Dart_SetField(runtime_options_type, native_name, dart_arguments);
 }
 
 
 #define CHECK_RESULT(result)                                                   \
   if (Dart_IsError(result)) {                                                  \
     *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,
                                                 void* data,
-                                                char** error) {
+                                                char** error,
+                                                bool* is_compile_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.
@@ skipping 65 matching lines @@
     return NULL;
   }
 
   return isolate;
 }
 
 
 static Dart_Isolate CreateIsolateAndSetup(const char* script_uri,
                                           const char* main,
                                           void* data, char** error) {
+  bool is_compile_error = false;
   return CreateIsolateAndSetupHelper(script_uri,
                                      main,
                                      new IsolateData(),
-                                     error);
+                                     error,
+                                     &is_compile_error);
 }
 
 
 static void PrintVersion() {
   Log::PrintErr("Dart VM version: %s\n", Dart_VersionString());
 }
 
 
 static void PrintUsage() {
   Log::PrintErr(
@@ skipping 238 matching lines @@
     bool r = VmService::Start(vm_service_server_port);
     if (!r) {
       Log::PrintErr("Could not start VM Service isolate %s",
                     VmService::GetErrorMessage());
     }
   }
 
   // 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");
   Dart_Isolate isolate = CreateIsolateAndSetupHelper(script_name,
                                                      "main",
                                                      new IsolateData(),
-                                                     &error);
+                                                     &error,
+                                                     &is_compile_error);
   if (isolate == NULL) {
     Log::PrintErr("%s\n", error);
     free(error);
     delete [] isolate_name;
-    return kErrorExitCode;  // Indicates we encountered an error.
+    return is_compile_error ? kCompilationErrorExitCode : kErrorExitCode;
   }
   delete [] isolate_name;
 
   Dart_EnterIsolate(isolate);
   ASSERT(isolate == Dart_CurrentIsolate());
   ASSERT(isolate != NULL);
   Dart_Handle result;
 
   Dart_EnterScope();
 
   if (generate_script_snapshot) {
     // First create a snapshot.
     Dart_Handle result;
     uint8_t* buffer = NULL;
     intptr_t size = 0;
     result = Dart_CreateScriptSnapshot(&buffer, &size);
     if (Dart_IsError(result)) {
       Log::PrintErr("%s\n", Dart_GetError(result));
       Dart_ExitScope();
       Dart_ShutdownIsolate();
-      return kErrorExitCode;  // Indicates we encountered an error.
+      return DartErrorExit(result);
     }
 
     // Write the magic number to indicate file is a script snapshot.
     DartUtils::WriteMagicNumber(snapshot_file);
 
     // Now write the snapshot out to specified file.
     bool bytes_written = snapshot_file->WriteFully(buffer, size);
     ASSERT(bytes_written);
     delete snapshot_file;
   } else {
@@ skipping 67 matching lines @@
 
   return Process::GlobalExitCode();
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   return dart::bin::main(argc, argv);
 }