Additional clean ups on errors in bitcode parsing.

lib/Bitcode/NaCl/Reader/NaClBitcodeParser.cpp

 //===- NaClBitcodeParser.cpp ----------------------------------------------===//
 //     Low-level bitcode driver to parse PNaCl bitcode files.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
@@ skipping 68 matching lines @@
   Parser->ProcessAbbreviation(IsLocal ? Parser->GetBlockID() : GlobalBlockID,
                               Abbrev, IsLocal);
 }
 
 NaClBitcodeParser::~NaClBitcodeParser() {
   if (EnclosingParser) {
     EnclosingParser->Block.LocalStartBit += Block.GetNumBits();
   }
 }
 
-bool NaClBitcodeParser::ErrorAt(uint64_t BitPosition,
-                                const std::string &Message) {
-  *ErrStream << "Error(" << NaClBitstreamReader::getBitAddress(BitPosition, 1)
-             << "): " << Message << "\n";
+bool NaClBitcodeParser::ErrorAt(
+    naclbitc::ErrorLevel Level, uint64_t BitPosition,
+    const std::string &Message) {
+  naclbitc::ErrorAt(*ErrStream, Level, BitPosition) << Message << "\n";
+  if (Level == naclbitc::Fatal)
+    report_fatal_error("Unable to continue");
   return true;
 }
 
-void NaClBitcodeParser::FatalAt(uint64_t BitPosition,
-                                const std::string &Message) {
-  ErrorAt(BitPosition, Message);
-  report_fatal_error("Unable to continue");
-}
-
 bool NaClBitcodeParser::Parse() {
   Record.ReadEntry();
 
   if (Record.GetEntryKind() != NaClBitstreamEntry::SubBlock)
     return Error("Expected block, but not found");
 
   return ParseBlock(Record.GetEntryID());
 }
 
 bool NaClBitcodeParser::ParseBlockInfoInternal() {
@@ skipping 42 matching lines @@
       } else {
         // Read in a record.
         Record.ReadValues();
         ProcessRecord();
       }
       break;
     }
   }
   return false;
 }