First attempt to capture parser/translation errors in browser.

src/IceBrowserCompileServer.cpp

 //===- subzero/src/IceBrowserCompileServer.cpp - Browser compile server ---===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines the browser-based compile server.
@@ skipping 63 matching lines @@
 int onDataCallback(const void *Data, size_t NumBytes) {
   return gCompileServer->pushInputBytes(Data, NumBytes) ? 1 : 0;
 }
 
 char *onEndCallback() {
   gCompileServer->endInputStream();
   gCompileServer->waitForCompileThread();
   // TODO(jvoung): Also return an error string, and UMA data.
   // Set up a report_fatal_error handler to grab that string.
   if (gCompileServer->getErrorCode().value()) {
-    return strdup("Some error occurred");
+    std::string Message("Some error occurred");
+    if (ErrorStream) {

[jvoung (off chromium), 2015/04/17 18:15:09]

ErrorStream *should* be non-null at this point, since it was able to check the
ErrorCode, and that wouldn't have been a real error code unless
startCompileThread() is already done (and that's where ErrorStream is created).

[Karl, 2015/04/17 21:33:52]

I agree that it shouldn't be null. I wasn't 100% sure so I added the test to be
safe. However, since you know the code more, I will remove the check.

+      std::string Error = ErrorStream->getContents();
+      if (!Error.empty())
+        Message = Error;
+    }
+    return strdup(Message);

[jvoung (off chromium), 2015/04/17 18:15:09]

strdup is usually given the c_str() -- or am I missing something?

[Karl, 2015/04/17 21:33:52]

My bad. Fixing.

   }
   return nullptr;
 }
 
 struct nacl_irt_pnacl_compile_funcs SubzeroCallbacks {
   &onInitCallback, &onDataCallback, &onEndCallback
 };
 
 std::unique_ptr<llvm::raw_fd_ostream> getOutputStream(int FD) {
   if (FD <= 0)
@@ skipping 40 matching lines @@
 }
 
 void BrowserCompileServer::endInputStream() { InputStream->SetDone(); }
 
 void BrowserCompileServer::startCompileThread(int ObjFD) {
   InputStream = new llvm::QueueStreamer();
   LogStream = getOutputStream(STDOUT_FILENO);
   LogStream->SetUnbuffered();
   EmitStream = getOutputStream(ObjFD);
   EmitStream->SetBufferSize(1 << 14);
+  ErrorStream = new StringStream();
   ELFStream.reset(new ELFStreamer(*EmitStream.get()));
   Ctx.reset(new GlobalContext(LogStream.get(), EmitStream.get(),
-                              ELFStream.get(), Flags));
+                              ELFStream.get(), Flags. ErrorStream.getStream()));

[jvoung (off chromium), 2015/04/17 18:15:09]

Should that be a comma instead of a period?

Might be better to group the streams and leave Flags at the end?

[Karl, 2015/04/17 21:33:52]

Fixed, and moved the streams into a group.

   CompileThread = std::thread([this]() {
     Ctx->initParserThread();
     this->getCompiler().run(ExtraFlags, *Ctx.get(),
                             // Retain original reference, but the compiler
                             // (LLVM's MemoryObject) wants to handle deletion.
                             std::unique_ptr<llvm::DataStreamer>(InputStream));
   });
 }
 
 } // end of namespace Ice
 
 #endif // PNACL_BROWSER_TRANSLATOR