Additional clean ups on errors in bitcode parsing.

lib/Bitcode/NaCl/Reader/NaClBitcodeParser.cpp

Index: lib/Bitcode/NaCl/Reader/NaClBitcodeParser.cpp
diff --git a/lib/Bitcode/NaCl/Reader/NaClBitcodeParser.cpp b/lib/Bitcode/NaCl/Reader/NaClBitcodeParser.cpp
index 3dc9a17bd755a7a868527fe1342742320e8ebe53..0c9ef637072644ce6e971690268bbc63852230ac 100644
--- a/lib/Bitcode/NaCl/Reader/NaClBitcodeParser.cpp
+++ b/lib/Bitcode/NaCl/Reader/NaClBitcodeParser.cpp
@@ -86,19 +86,15 @@ NaClBitcodeParser::~NaClBitcodeParser() {
   }
 }
 
-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();