Return a different exit code from the vm after compilation errors (issue 5525).

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 575 matching lines @@
 
   const char* kFormat = "%s/%s";
   intptr_t len = strlen(script_name) + strlen(func_name) + 2;
   char* buffer = new char[len];
   ASSERT(buffer != NULL);
   snprintf(buffer, len, kFormat, script_name, func_name);
   return buffer;
 }
 
 
+static const int kCompilationErrorExitCode = 254;  // Indicates a compile error.
 static const int kErrorExitCode = 255;  // Indicates we encountered an error.

[siva, 2013/07/15 22:42:20]

Should we change the comment of this to state
// Indicates a generic unhandled error.
or something like that.

[regis, 2013/07/15 23:32:47]

Done.

 
 
-static int ErrorExit(const char* format, ...) {
+static int ErrorExit(int exit_code, const char* format, ...) {
   va_list arguments;
   va_start(arguments, format);
   Log::VPrintErr(format, arguments);
   va_end(arguments);
   fflush(stderr);
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 
-  return kErrorExitCode;
+  return exit_code;
+}
+
+
+static int DartErrorExit(Dart_Handle error) {
+  const int exit_code = Dart_IsCompilationError(error) ?
+      kCompilationErrorExitCode: kErrorExitCode;

[siva, 2013/07/15 22:42:20]

kCompilationErrorExitCode : kErrorExitCode

[regis, 2013/07/15 23:32:47]

Done.

+  return ErrorExit(exit_code, "%s\n", Dart_GetError(error));
 }
 
 
 static void ShutdownIsolate(void* callback_data) {
   IsolateData* isolate_data = reinterpret_cast<IsolateData*>(callback_data);
   EventHandler* handler = isolate_data->event_handler;
   if (handler != NULL) handler->Shutdown();
   delete isolate_data;
 }
 
@@ skipping 140 matching lines @@
     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 {
     if (has_compile_all) {
       result = Dart_CompileAll();
       if (Dart_IsError(result)) {
-        return ErrorExit("%s\n", Dart_GetError(result));
+        return DartErrorExit(result);
       }
     }
 
     if (has_check_function_fingerprints) {
       result = Dart_CheckFunctionFingerprints();
       if (Dart_IsError(result)) {
-        return ErrorExit("%s\n", Dart_GetError(result));
+        return DartErrorExit(result);
       }
     }
 
     // Create a dart options object that can be accessed from dart code.
     Dart_Handle options_result =
         SetupRuntimeOptions(&dart_options, executable_name, script_name);
     if (Dart_IsError(options_result)) {
-      return ErrorExit("%s\n", Dart_GetError(options_result));
+      return DartErrorExit(options_result);
     }
     // Lookup the library of the root script.
     Dart_Handle library = Dart_RootLibrary();
     if (Dart_IsNull(library)) {
-      return ErrorExit("Unable to find root library for '%s'\n",
+      return ErrorExit(kErrorExitCode,
+                       "Unable to find root library for '%s'\n",
                        script_name);
     }
     // Set debug breakpoint if specified on the command line.
     if (breakpoint_at != NULL) {
       result = SetBreakpoint(breakpoint_at, library);
       if (Dart_IsError(result)) {
-        return ErrorExit("Error setting breakpoint at '%s': %s\n",
+        return ErrorExit(kErrorExitCode,
+                         "Error setting breakpoint at '%s': %s\n",
                          breakpoint_at,
                          Dart_GetError(result));
       }
     }
     if (has_print_script) {
       result = GenerateScriptSource();
       if (Dart_IsError(result)) {
-        return ErrorExit("%s\n", Dart_GetError(result));
+        return DartErrorExit(result);
       }
     } else {
       // Lookup and invoke the top level main function.
       result = Dart_Invoke(library, DartUtils::NewString("main"), 0, NULL);
       if (Dart_IsError(result)) {
-        return ErrorExit("%s\n", Dart_GetError(result));
+        return DartErrorExit(result);
       }
 
       // Keep handling messages until the last active receive port is closed.
       result = Dart_RunLoop();
       if (Dart_IsError(result)) {
-        return ErrorExit("%s\n", Dart_GetError(result));
+        return DartErrorExit(result);
       }
     }
   }
 
   Dart_ExitScope();
   // Shutdown the isolate.
   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();
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   return dart::bin::main(argc, argv);
 }