Additional clean ups on errors in bitcode parsing.

lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp

 //===- NaClBitcodeReader.cpp ----------------------------------------------===//
 //     Internal NaClBitcodeReader implementation
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
@@ skipping 174 matching lines @@
 
 static const unsigned MaxAlignmentExponent = 29;
 static_assert(
     (1u << MaxAlignmentExponent) == Value::MaximumAlignment,
     "Inconsistency between Value.MaxAlignment and PNaCl alignment limit");
 }
 
 std::error_code NaClBitcodeReader::Error(ErrorType E,
                                          const std::string &Message) const {
   if (Verbose) {
-    uint64_t Bit = Stream.GetCurrentBitNo();
-    *Verbose << "Error: (" <<  (Bit / CHAR_BIT) << ":"
-             << static_cast<unsigned>(Bit % CHAR_BIT)
-             << ") " << Message << "\n";
+    naclbitc::ErrorAt(*Verbose, naclbitc::Error, Stream.GetCurrentBitNo())
+        << Message << "\n";
   }
   return Error(E);
 }
 
 std::error_code NaClBitcodeReader::getAlignmentValue(
     uint64_t Exponent, unsigned &Alignment) {
   if (Exponent > MaxAlignmentExponent + 1) {
     std::string Buffer;
     raw_string_ostream StrBuf(Buffer);
     StrBuf << "Alignment can't be greater than 2**" << MaxAlignmentExponent
@@ skipping 1728 matching lines @@
   if (std::error_code EC = M->materializeAllPermanently()) {
     delete M;
     return EC;
   }
 
   // TODO: Restore the use-lists to the in-memory state when the bitcode was
   // written.  We must defer until the Module has been fully materialized.
 
   return M;
 }