Additional clean ups on errors in bitcode parsing.

unittests/Bitcode/NaClObjDumpTest.cpp

 //===- llvm/unittest/Bitcode/NaClObjDumpTest.cpp -------------------------===//
 //     Tests objdump stream for PNaCl bitcode.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
@@ skipping 24 matching lines @@
 // Runs some simple assembly examples against the given bitcode
 // record, using an objdump stream.
 static void RunAssemblyExamples(
     ObjDumpStream &Stream, uint64_t Bit,
     const NaClBitcodeRecordData *Record,
     int32_t AbbrevIndex,
     bool AddErrors) {
 
   // First assume no assembly.
   if (AddErrors)
-    Stream.Error(Bit) << "This is an error\n";
+    Stream.ErrorAt(Bit) << "This is an error\n";
   Write(Stream, Bit, Record, AbbrevIndex);
   // Increment bit to new fictitious address, assuming Record takes 21 bits.
   Bit += 21;
 
   // Now a single line assembly.
   if (AddErrors)
-    Stream.Error(Bit) << "Oops, an error!\n";
+    Stream.ErrorAt(Bit) << "Oops, an error!\n";
   Stream.Assembly() << "One line assembly.";
   Write(Stream, Bit, Record, AbbrevIndex);
   // Increment bit to new fictitious address, assuming Record takes 17 bits.
   Bit += 17;
 
   // Now multiple line assembly.
   if (AddErrors)
-    Stream.Error(Bit) << "The record looks bad\n";
+    Stream.ErrorAt(Bit) << "The record looks bad\n";
   Stream.Assembly() << "Two Line\nexample assembly.";
   if (AddErrors)
-    Stream.Error(Bit) << "Actually, it looks really bad\n";
+    Stream.ErrorAt(Bit) << "Actually, it looks really bad\n";
   Write(Stream, Bit, Record, AbbrevIndex);
 }
 
 // Runs some simple assembly examples against the given bitcode record
 // using an objdump stream. Adds a message describing the test
 // and the record indent being used.
 static std::string RunIndentedAssemblyWithAbbrevTest(
     bool DumpRecords, bool DumpAssembly,
     unsigned NumRecordIndents, uint64_t Bit,
     const NaClBitcodeRecordData *Record, int32_t AbbrevIndex, bool AddErrors) {
@@ skipping 706 matching lines @@
       RunIndentedAssemblyWithAbbrevTest(false, false, 1, 64564, &Record,
                                         naclbitc::UNABBREV_RECORD, false));
 
   EXPECT_EQ(
       "",
       RunIndentedAssemblyWithAbbrevTest(false, false, 2, 64564, &Record,
                                         naclbitc::UNABBREV_RECORD, false));
 }
 
 }