Fix error reporting in the PNaCl bitcode reader.

unittests/Bitcode/NaClObjDumpTypesTest.cpp

 //===- llvm/unittest/Bitcode/NaClObjDumpTypesTest.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 20 matching lines @@
     3, 1, 2, Terminator,
     3, 7, 32, Terminator,
     3, 3, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 4;
 
   // Show base input.
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
   EXPECT_TRUE(Munger.runTestForAssembly("Bad type references base"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 2;\n"
       "    @t0 = i32;\n"
       "    @t1 = float;\n"
       "  }\n"
       "}\n",
@@ skipping 43 matching lines @@
     3, 1, 2, Terminator,
     3, 7, 32, Terminator,
     3, 3, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t AddBeforeIndex = 5;
   const uint64_t ReplaceIndex = 2;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test case where count is correct.
   EXPECT_TRUE(Munger.runTestForAssembly("Good case"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 2;\n"
       "    @t0 = i32;\n"
       "    @t1 = float;\n"
@@ skipping 74 matching lines @@
     1, 65535, 8, 2, Terminator,
     1, 65535, 17, 2, Terminator,
     3, 1, 1, Terminator,
     3, 2, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 3;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test where void is properly specified.
   EXPECT_TRUE(Munger.runTestForAssembly("Good case"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 1;\n"
       "    @t0 = void;\n"
       "  }\n"
@@ skipping 20 matching lines @@
     1, 65535, 8, 2, Terminator,
     1, 65535, 17, 2, Terminator,
     3, 1, 1, Terminator,
     3, 7, 1,  Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 3;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Tests that we accept i1.
   EXPECT_TRUE(Munger.runTestForAssembly("Test type i1"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 1;\n"
       "    @t0 = i1;\n"
       "  }\n"
@@ skipping 88 matching lines @@
     1, 65535, 8, 2, Terminator,
     1, 65535, 17, 2, Terminator,
     3, 1, 1, Terminator,
     3, 3,  Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 3;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test that we accept the float record.
   EXPECT_TRUE(Munger.runTestForAssembly("Good case"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 1;\n"
       "    @t0 = float;\n"
       "  }\n"
@@ skipping 21 matching lines @@
     1, 65535, 8, 2, Terminator,
     1, 65535, 17, 2, Terminator,
     3, 1, 1, Terminator,
     3, 4, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 3;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test that we accept the double record.
   EXPECT_TRUE(Munger.runTestForAssembly("Good case"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 1;\n"
       "    @t0 = double;\n"
       "  }\n"
@@ skipping 22 matching lines @@
     1, 65535, 17, 2, Terminator,
     3, 1, 2, Terminator,
     3, 7, 32, Terminator,
     3, 12, 4, 0, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 4;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test correct length vector record.
   EXPECT_TRUE(Munger.runTestForAssembly("Test valid vector record"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 2;\n"
       "    @t0 = i32;\n"
       "    @t1 = <4 x i32>;\n"
@@ skipping 35 matching lines @@
     1, 65535, 17, 2, Terminator,
     3, 1, 2, Terminator,
     3, 7, 1, Terminator,
     3, 12, 4, 0, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 4;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test that we accept <4 x i1>.
   EXPECT_TRUE(Munger.runTestForAssembly("Type <4 x i1>"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 2;\n"
       "    @t0 = i1;\n"
       "    @t1 = <4 x i1>;\n"
@@ skipping 75 matching lines @@
     1, 65535, 17, 2, Terminator,
     3, 1, 2, Terminator,
     3, 7, 8, Terminator,
     3, 12, 16, 0, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 4;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test that we accept <16 x i8>.
   EXPECT_TRUE(Munger.runTestForAssembly("Type <16 x i8>"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 2;\n"
       "    @t0 = i8;\n"
       "    @t1 = <16 x i8>;\n"
@@ skipping 87 matching lines @@
     1, 65535, 17, 2, Terminator,
     3, 1, 2, Terminator,
     3, 7, 16, Terminator,
     3, 12, 8, 0, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 4;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test that we accept <8 x i16>.
   EXPECT_TRUE(Munger.runTestForAssembly("Type <16 x i16>"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 2;\n"
       "    @t0 = i16;\n"
       "    @t1 = <8 x i16>;\n"
@@ skipping 87 matching lines @@
     1, 65535, 17, 2, Terminator,
     3, 1, 2, Terminator,
     3, 7, 32, Terminator,
     3, 12, 4, 0, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 4;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test that we accept <4 x i32>.
   EXPECT_TRUE(Munger.runTestForAssembly("Type <4 x i32>"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 2;\n"
       "    @t0 = i32;\n"
       "    @t1 = <4 x i32>;\n"
@@ skipping 87 matching lines @@
     1, 65535, 17, 2, Terminator,
     3, 1, 2, Terminator,
     3, 7, 64, Terminator,
     3, 12, 1, 0, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 4;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test that we reject <1 x i64>.
   EXPECT_FALSE(Munger.runTestForAssembly("Type <1 x i64>"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 2;\n"
       "    @t0 = i64;\n"
       "    @t1 = <1 x i64>;\n"
@@ skipping 88 matching lines @@
     1, 65535, 17, 2, Terminator,
     3, 1, 2, Terminator,
     3, 3, Terminator,
     3, 12, 4, 0, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 4;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test that we accept <4 x float>.
   EXPECT_TRUE(Munger.runTestForAssembly("Type <4 x float>"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 2;\n"
       "    @t0 = float;\n"
       "    @t1 = <4 x float>;\n"
@@ skipping 61 matching lines @@
     1, 65535, 17, 2, Terminator,
     3, 1, 2, Terminator,
     3, 4, Terminator,
     3, 12, 4, 0, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t ReplaceIndex = 4;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test that we reject <4 x double>.
   EXPECT_FALSE(Munger.runTestForAssembly("Type <4 x double>"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 2;\n"
       "    @t0 = double;\n"
       "    @t1 = <4 x double>;\n"
@@ skipping 59 matching lines @@
 TEST(NaClObjDumpTypesTest, TestVoidVectorRecord) {
   const uint64_t BitcodeRecords[] = {
     1, 65535, 8, 2, Terminator,
     1, 65535, 17, 2, Terminator,
     3, 1, 2, Terminator,
     3, 2, Terminator,
     3, 12, 4, 0, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
   EXPECT_FALSE(Munger.runTestForAssembly("Type <4 x void>"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 2;\n"
       "    @t0 = void;\n"
       "    @t1 = <4 x i32>;\n"
       "Error(36:2): Vectors can only be defined on primitive types. "
       "Found void. Assuming i32 instead.\n"
       "  }\n"
       "}\n",
       Munger.getTestResults());
 }
 
 // Tests that we don't allow vectors of vectors.
 TEST(NaClObjDumpTypesTest, TestNestedVectorRecord) {
   const uint64_t BitcodeRecords[] = {
     1, 65535, 8, 2, Terminator,
     1, 65535, 17, 2, Terminator,
     3, 1, 3, Terminator,
     3, 3, Terminator,
     3, 12, 4, 0, Terminator,
     3, 12, 4, 1, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
   EXPECT_FALSE(Munger.runTestForAssembly("Type <4 x <4 x float>>"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 3;\n"
       "    @t0 = float;\n"
       "    @t1 = <4 x float>;\n"
       "    @t2 = <4 x i32>;\n"
       "Error(39:4): Vectors can only be defined on primitive types. "
@@ skipping 16 matching lines @@
     3, 4, Terminator,
     3, 12, 4, 2, Terminator,
     3, 21, 0, 0, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
 
   const uint64_t TypeCountIndex = 2;
   const uint64_t ReplaceIndex = 9;
 
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
 
   // Test void() signature.
   EXPECT_TRUE(Munger.runTestForAssembly("Type void()"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 7;\n"
       "    @t0 = void;\n"
       "    @t1 = i16;\n"
@@ skipping 129 matching lines @@
 // Tests how we report unknown record codes in the types block.
 TEST(NaClObjDumpTypesTest, TestUnknownTypesRecordCode) {
   const uint64_t BitcodeRecords[] = {
     1, 65535, 8, 2, Terminator,
     1, 65535, 17, 2, Terminator,
     3, 1, 1, Terminator,
     3, 10, Terminator,
     0, 65534, Terminator,
     0, 65534, Terminator
   };
-  NaClBitcodeMunger Munger(BitcodeRecords,
+  NaClObjDumpMunger Munger(BitcodeRecords,
                            array_lengthof(BitcodeRecords), Terminator);
   EXPECT_FALSE(Munger.runTestForAssembly("Unknown types record code"));
   EXPECT_EQ(
       "module {  // BlockID = 8\n"
       "  types {  // BlockID = 17\n"
       "    count 1;\n"
       "Error(34:4): Unknown record code in types block. Found: 10\n"
       "  }\n"
       "Error(36:2): Expected 1 types but found: 0\n"
       "}\n",
       Munger.getTestResults());
 }
 
 } // End of anonymous namespace.