Report fatal translator errors to the browser

lib/Bitcode/NaCl/Reader/NaClBitcodeHeader.cpp

 //===- NaClBitcodeHeader.cpp ----------------------------------------------===//
 //     PNaCl bitcode header reader.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Bitcode/NaCl/NaClBitcodeHeader.h"
 #include "llvm/Bitcode/NaCl/NaClReaderWriter.h"
+#include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/StreamableMemoryObject.h"
 
 #include <limits>
 #include <cstring>
 #include <iomanip>
 
 using namespace llvm;
@@ skipping 88 matching lines @@
   case kBufferType:
     ss << "[";
     for (size_t i = 0; i < Len; ++i) {
       if (i)
         ss << " ";
       ss << format("%02x", Data[i]);
     }
     ss << "]";
     break;
   default:
-    report_fatal_error("PNaCL bitcode file contains unknown field type");
+    report_fatal_error("PNaCl bitcode file contains unknown field type");
   }
   return ss.str();
 }
 
 NaClBitcodeHeader::NaClBitcodeHeader()
     : HeaderSize(0), UnsupportedMessage(), IsSupportedFlag(false),
       IsReadableFlag(false), PNaClVersion(0) {}
 
 NaClBitcodeHeader::~NaClBitcodeHeader() {
   for (std::vector<NaClBitcodeHeaderField *>::const_iterator
            Iter = Fields.begin(),
            IterEnd = Fields.end();
        Iter != IterEnd; ++Iter) {
     delete *Iter;
   }
 }
 
 bool NaClBitcodeHeader::ReadPrefix(const unsigned char *BufPtr,
                                    const unsigned char *BufEnd,
                                    unsigned &NumFields, unsigned &NumBytes) {
   // Must contain PEXE.
-  if (!isNaClBitcode(BufPtr, BufEnd))
+  if (!isNaClBitcode(BufPtr, BufEnd)) {
+    UnsupportedMessage = "Invalid PNaCl bitcode header";
+    if (isBitcode(BufPtr, BufEnd)) {
+      UnsupportedMessage += " (to run in Chrome, bitcode files must be "
+          "finalized using pnacl-finalize";

[jvoung (off chromium), 2013/09/10 20:39:56]

add an end parenthesis to match the beginning "(to run..."

[Derek Schuff, 2013/09/13 19:53:36]

Done.

+    }
     return true;
+  }
   BufPtr += WordSize;
 
   // Read #Fields and number of bytes needed for the header.
   if (BufPtr + WordSize > BufEnd)
     return true;
   NumFields = static_cast<unsigned>(BufPtr[0]) |
       (static_cast<unsigned>(BufPtr[1]) << 8);
   NumBytes = static_cast<unsigned>(BufPtr[2]) |
       (static_cast<unsigned>(BufPtr[3]) << 8);
   BufPtr += WordSize;
@@ skipping 101 matching lines @@
                       << PNaClVersion << "\n";
     UnsupportedStream.flush();
   }
   if (Fields.size() != 1) {
     IsSupportedFlag = false;
     IsReadableFlag = false;
     if (!UpdatedUnsupportedMessage)
       UnsupportedMessage = "Unknown header field(s) found";
   }
 }