Fix the NaCl bitstream reader to report fatal errors.

lib/Bitcode/NaCl/Analysis/NaClObjDumpStream.cpp

 //===-- NaClObjDumpStream.cpp --------------------------------------------===//
 //      Implements an objdump stream (bitcode records/assembly code).
 //
 //                     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/NaClObjDumpStream.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Format.h"

[jvoung (off chromium), 2015/02/20 00:12:42]

No longer need Format.h?

[Karl, 2015/02/20 21:41:17]

Done.

 
 #include <inttypes.h>
 
 namespace llvm {
 namespace naclbitc {
 
 TextFormatter::TextFormatter(raw_ostream &BaseStream,
                              unsigned LineWidth,
                              const char *Tab)
     : TextIndenter(Tab),
@@ skipping 139 matching lines @@
       Endline(this),
       StartCluster(this),
       FinishCluster(this) {
   // Handle fact that 64-bit values can take up to 21 characters.
   MinLineWidth = 21;
   Label = RecordAddress(0);
 }
 
 std::string RecordTextFormatter::RecordAddress(uint64_t Bit,
                                                unsigned MinByteWidth) {
-  std::string Buffer;
-  raw_string_ostream Stream(Buffer);
-  Stream << '%' << MinByteWidth << PRIu64 << ":%u";
-  Stream.flush();
-  std::string FormatString(Buffer);
-  Buffer.clear();
-  Stream << format(FormatString.c_str(),
-                   (Bit / 8),
-                   static_cast<unsigned>(Bit % 8));
-  return Stream.str();
+  return NaClBitstreamReader::getBitAddress(Bit, MinByteWidth);

[jvoung (off chromium), 2015/02/20 00:12:42]

Can this variant of RecordAddress be removed and
NaClBitstreamReader::getBitAddress() inlined, or is that too awkward?

[Karl, 2015/02/20 21:41:17]

Removed all instances of RecordAddress and ObjDumpAddress. I also removed
unnecessary fields (to be able to call these routines), as well as cleaning up
the bitstream cursor of the formatter, so that a start offset is no longer
needed (i.e. it points the the logical position within the file).

 }
 
 std::string RecordTextFormatter::GetEmptyLabelColumn() {
   std::string Buffer;
   raw_string_ostream StrmBuffer(Buffer);
   for (size_t i = 0; i < Label.size(); ++i) {
     StrmBuffer << ' ';
   }
   StrmBuffer << '|';
   return StrmBuffer.str();
@@ skipping 75 matching lines @@
   Flush();
   llvm::report_fatal_error("Unable to continue");
 }
 
 void ObjDumpStream::Fatal(uint64_t Bit,
                           const llvm::NaClBitcodeRecordData &Record,
                           const std::string &Message) {
   LastKnownBit = Bit;
   PrintMessagePrefix("Error", Bit) << Message;
   Write(Bit, Record);
+  Flush();
   llvm::report_fatal_error("Unable to continue");
 }
 
 // Dumps the next line of text in the buffer. Returns the number of characters
 // printed.
 static size_t DumpLine(raw_ostream &Stream,
                        const std::string &Buffer,
                        size_t &Index,
                        size_t Size) {
   size_t Count = 0;
@@ skipping 57 matching lines @@
     // an infinite loop.
     Stream << "Error(" << ObjDumpAddress(LastKnownBit)
            << "): Too many errors\n";
     llvm::report_fatal_error("Unable to continue");
   }
   Stream.flush();
 }
 
 }
 }