Fix the NaCl bitstream reader to report fatal errors.

unittests/Bitcode/NaClAbbrevErrorTests.cpp

Index: unittests/Bitcode/NaClAbbrevErrorTests.cpp
diff --git a/unittests/Bitcode/NaClAbbrevErrorTests.cpp b/unittests/Bitcode/NaClAbbrevErrorTests.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..fba2a5ef10c3e75cb93116db4a4e01817bb0191f
--- /dev/null
+++ b/unittests/Bitcode/NaClAbbrevErrorTests.cpp
@@ -0,0 +1,93 @@
+//===- llvm/unittest/Bitcode/NaClAbbrevErrorTests.cpp ---------------------===//
+//     Tests parser for PNaCl bitcode instructions.
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// Tests errors on bad abbreviation index.
+
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Bitcode/NaCl/NaClBitcodeMunge.h"
+#include "llvm/Bitcode/NaCl/NaClBitcodeParser.h"
+#include "llvm/Bitcode/NaCl/NaClLLVMBitCodes.h"
+
+#include "gtest/gtest.h"
+
+using namespace llvm;
+
+namespace {
+
+static const uint64_t Terminator = 0x5768798008978675LL;
+
+/// Test if we handle badly defined abbreviation indices.
+TEST(MyDeathNaClOtherParseTest, BadAbbreviationIndex) {

[jvoung (off chromium), 2015/02/23 18:58:56]

Could rename "MyDeathNaClOtherParseTest" to something related to abbrev errors
now

[Karl, 2015/02/23 20:46:23]

Done.

+  const uint64_t BitcodeRecords[] = {
+    1, naclbitc::BLK_CODE_ENTER, naclbitc::MODULE_BLOCK_ID, 2, Terminator,
+    1, naclbitc::BLK_CODE_ENTER, naclbitc::TYPE_BLOCK_ID_NEW, 3, Terminator,
+    3, naclbitc::TYPE_CODE_NUMENTRY, 2, Terminator,
+    3, naclbitc::TYPE_CODE_VOID, Terminator,
+    3, naclbitc::TYPE_CODE_FUNCTION, 0, 0, Terminator,
+    0, naclbitc::BLK_CODE_EXIT, Terminator,
+    3, naclbitc::MODULE_CODE_FUNCTION, 1, 0, 0, 0, Terminator,
+    1, naclbitc::BLK_CODE_ENTER, naclbitc::FUNCTION_BLOCK_ID, 2, Terminator,
+    3, naclbitc::FUNC_CODE_DECLAREBLOCKS, 1, Terminator,
+    3, naclbitc::FUNC_CODE_INST_RET, Terminator,
+    0, naclbitc::BLK_CODE_EXIT, Terminator,
+    0, naclbitc::BLK_CODE_EXIT, Terminator
+  };
+
+  const uint64_t ReplaceIndex = 3; // Index for TYPE_CODE_VOID;
+
+  // Show that we can parse this code.
+  NaClObjDumpMunger DumpMunger(BitcodeRecords,
+                               array_lengthof(BitcodeRecords), Terminator);
+  EXPECT_TRUE(DumpMunger.runTest("BadAbbreviationIndex assembly"));
+  EXPECT_EQ(
+      "       0:0|<65532, 80, 69, 88, 69, 1, 0,|Magic Number: 'PEXE' (80, 69, "
+      "88, 69)\n"
+      "          | 8, 0, 17, 0, 4, 0, 2, 0, 0, |PNaCl Version: 2\n"
+      "          | 0>                          |\n"
+      "      16:0|1: <65535, 8, 2>             |module {  // BlockID = 8\n"
+      "      24:0|  1: <65535, 17, 3>          |  types {  // BlockID = 17\n"
+      "      32:0|    3: <1, 2>                |    count 2;\n"
+      "      34:5|    3: <2>                   |    @t0 = void;\n"
+      "      36:4|    3: <21, 0, 0>            |    @t1 = void ();\n"
+      "      39:7|  0: <65534>                 |  }\n"
+      "      44:0|  3: <8, 1, 0, 0, 0>         |  define external void @f0();\n"
+      "      48:6|  1: <65535, 12, 2>          |  function void @f0() {  \n"
+      "          |                             |                   // BlockID "
+      "= 12\n"
+      "      56:0|    3: <1, 1>                |    blocks 1;\n"
+      "          |                             |  %b0:\n"
+      "      58:4|    3: <10>                  |    ret void;\n"
+      "      60:2|  0: <65534>                 |  }\n"
+      "      64:0|0: <65534>                   |}\n"
+      "",
+      DumpMunger.getTestResults());
+
+  // Shows what happens when we change the abbreviation index to an
+  // illegal value.
+  const uint64_t AbbrevIndex4[] = {
+    ReplaceIndex, NaClBitcodeMunger::Replace,
+    4, naclbitc::TYPE_CODE_VOID, Terminator,
+  };
+  DumpMunger.setRunAsDeathTest(true);
+  EXPECT_DEATH(
+      DumpMunger.runTest("Bad abbreviation index 4",
+                         AbbrevIndex4, array_lengthof(AbbrevIndex4)),
+      ".*Error\\(35\\:0\\)\\: Invalid abbreviation \\# 4 defined for record.*");
+
+  // Test that bitcode reader reports problem correctly.
+  NaClParseBitcodeMunger Munger(BitcodeRecords,
+                                array_lengthof(BitcodeRecords), Terminator);
+  EXPECT_DEATH(
+      Munger.runTest("Bad abbreviation index",
+                     AbbrevIndex4, array_lengthof(AbbrevIndex4), true),
+      ".*Error\\(35\\:0\\)\\: Invalid abbreviation \\# 4 defined for record.*");
+}
+
+} // end of anonymous namespace.