Report fatal translator errors to the browser

tools/pnacl-llc/srpc_main.cpp

 //===-- srpc_main.cpp - PNaCl sandboxed translator invocation -------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Main invocation of the sandboxed translator through SRPC.
@@ skipping 14 matching lines @@
 #include <argz.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <string>
 
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Option/Option.h"
+#include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/system_error.h"
 
 using namespace llvm;
 using namespace llvm::opt;
 using std::string;
 
 // Imported from pnacl-llc.cpp
 extern int llc_main(int argc, char **argv);
 
 namespace {
@@ skipping 150 matching lines @@
   int ObjectFD() const { return object_fd_; }
   ArgStringList *CmdLineVec() const { return cmd_line_vec_.get(); }
   const int object_fd_;
   const OwningPtr<ArgStringList> cmd_line_vec_;
 };
 
 void *run_streamed(void *arg) {
   StreamingThreadData *data = reinterpret_cast<StreamingThreadData *>(arg);
   data->CmdLineVec()->push_back("-streaming-bitcode");
   if (DoTranslate(data->CmdLineVec(), data->ObjectFD()) != 0) {
-    fprintf(stderr, "DoTranslate failed.\n");
-    srpc_streamer->setError();
+    // llc_main only returns 1 (as opposed to calling report_fatal_error)
+    // in conditions we never expect to see in the browser (e.g. bad
+    // command-line flags).
+    srpc_streamer->setFatalError("llc_main unspecified failure");
     return NULL;
   }
   delete data;
   return NULL;
 }
 
 // Actually do the work for stream initialization.
 void do_stream_init(NaClSrpcRpc *rpc, NaClSrpcArg **in_args,
                     NaClSrpcArg **out_args, NaClSrpcClosure *done,
                     ArgStringList *command_line_vec) {
@@ skipping 127 matching lines @@
   { "StreamChunk:C:", stream_chunk }, { "StreamEnd::isss", stream_end },
   { NULL, NULL },
 };
 
 } // namespace
 
 int getObjectFileFD() { return object_file_fd; }
 
 DataStreamer *getNaClBitcodeStreamer() { return NaClBitcodeStreamer; }
 
+// Called from the compilation thread
+void FatalErrorHandler(void *user_data, const std::string& reason,
+                       bool gen_crash_diag) {
+  srpc_streamer->setFatalError(reason);
+}
+
+fatal_error_handler_t getSRPCErrorHandler() { return FatalErrorHandler; }
+
 int srpc_main(int argc, char **argv) {
   if (!NaClSrpcModuleInit()) {
     return 1;
   }
 
   if (!NaClSrpcAcceptClientConnection(srpc_methods)) {
     return 1;
   }
   NaClSrpcModuleFini();
   return 0;
 }
 
 #endif // __native_client__