[llvm-readobj] Update readobj to re-use parsing code.

llvm-readobj hand rolls some CodeView parsing code for string
tables, so this patch updates it to re-use some of the newly
introduced parsing code in LLVMDebugInfoCodeView.

Differential Revision: https://reviews.llvm.org/D32772

llvm-svn: 302052

1 files changed, 13 insertions, 6 deletions

diff --git a/llvm/unittests/DebugInfo/PDB/StringTableBuilderTest.cpp b/llvm/unittests/DebugInfo/PDB/StringTableBuilderTest.cpp
index 44cc85d9e44..2cfac801141 100644
--- a/llvm/unittests/DebugInfo/PDB/StringTableBuilderTest.cpp
+++ b/llvm/unittests/DebugInfo/PDB/StringTableBuilderTest.cpp
@@ -25,6 +25,12 @@ namespace {
 class StringTableBuilderTest : public ::testing::Test {};
 }
 
+template <typename T>
+static void ExpectExpected(Expected<T> &&E, const T &Value) {
+  EXPECT_EXPECTED(E);
+  EXPECT_EQ(Value, *E);
+}
+
 TEST_F(StringTableBuilderTest, Simple) {
   // Create /names table contents.
   PDBStringTableBuilder Builder;
@@ -46,10 +52,11 @@ TEST_F(StringTableBuilderTest, Simple) {
 
   EXPECT_EQ(3U, Table.getNameCount());
   EXPECT_EQ(1U, Table.getHashVersion());
-  EXPECT_EQ("foo", Table.getStringForID(1));
-  EXPECT_EQ("bar", Table.getStringForID(5));
-  EXPECT_EQ("baz", Table.getStringForID(9));
-  EXPECT_EQ(1U, Table.getIDForString("foo"));
-  EXPECT_EQ(5U, Table.getIDForString("bar"));
-  EXPECT_EQ(9U, Table.getIDForString("baz"));
+
+  EXPECT_EXPECTED_EQ("foo", Table.getStringForID(1));
+  EXPECT_EXPECTED_EQ("bar", Table.getStringForID(5));
+  EXPECT_EXPECTED_EQ("baz", Table.getStringForID(9));
+  EXPECT_EXPECTED_EQ(1U, Table.getIDForString("foo"));
+  EXPECT_EXPECTED_EQ(5U, Table.getIDForString("bar"));
+  EXPECT_EXPECTED_EQ(9U, Table.getIDForString("baz"));
 }