PNaCl Coordinator: Run StreamEnd RPC even if StreamChunk fails

ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h"
 
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h"
 #include "ppapi/native_client/src/trusted/plugin/pnacl_resources.h"
@@ skipping 182 matching lines @@
       std::vector<char> data;
       data.swap(data_buffers_.front());
       data_buffers_.pop_front();
       NaClXMutexUnlock(&cond_mu_);
       PLUGIN_PRINTF(("StreamChunk\n"));
       if (!llc_subprocess_->InvokeSrpcMethod("StreamChunk",
                                              "C",
                                              &params,
                                              &data[0],
                                              data.size())) {
-        TranslateFailed(ERROR_PNACL_LLC_INTERNAL,
-                        "Compile stream chunk failed.");
-        return;
+        if (llc_subprocess_->srpc_client()->GetLastError() !=
+            NACL_SRPC_RESULT_APP_ERROR) {
+          // If the error was reported by the translator, then we fall through
+          // and call StreamEnd, which returns a string describing the error,
+          // which we can then send to the Javascript console. Otherwise just
+          // fail here, since the translator has probably crashed or asserted.
+          TranslateFailed(ERROR_PNACL_LLC_INTERNAL,
+                          "Compile stream chunk failed. "
+                          "The PNaCl translator has probably crashed.");
+          return;
+        }
+        break;
+      } else {
+        PLUGIN_PRINTF(("StreamChunk Successful\n"));
+        core->CallOnMainThread(
+            0,
+            coordinator_->GetCompileProgressCallback(data.size()),
+            PP_OK);
       }
-      PLUGIN_PRINTF(("StreamChunk Successful\n"));
-      core->CallOnMainThread(
-          0,
-          coordinator_->GetCompileProgressCallback(data.size()),
-          PP_OK);
     } else {
       NaClXMutexUnlock(&cond_mu_);
     }
   }
   PLUGIN_PRINTF(("PnaclTranslateThread done with chunks\n"));
   // Finish llc.
   if (!llc_subprocess_->InvokeSrpcMethod("StreamEnd", std::string(), &params)) {
     PLUGIN_PRINTF(("PnaclTranslateThread StreamEnd failed\n"));
     if (llc_subprocess_->srpc_client()->GetLastError() ==
         NACL_SRPC_RESULT_APP_ERROR) {
@@ skipping 131 matching lines @@
   AbortSubprocesses();
   if (translate_thread_ != NULL)
     NaClThreadJoin(translate_thread_.get());
   PLUGIN_PRINTF(("~PnaclTranslateThread joined\n"));
   NaClCondVarDtor(&buffer_cond_);
   NaClMutexDtor(&cond_mu_);
   NaClMutexDtor(&subprocess_mu_);
 }
 
 } // namespace plugin