diff options
| author | Greg Clayton <gclayton@apple.com> | 2016-12-13 23:20:56 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2016-12-13 23:20:56 +0000 |
| commit | 1cbf3fa94a6ef7a3dd4f5d177aeed5ea3fa539bc (patch) | |
| tree | e7878576b7b64074b8144a8ef3b233c2962711c5 /llvm/unittests/DebugInfo/DWARF | |
| parent | 98d40e0557290d7b17533ed86a5ce41f90ff1626 (diff) | |
| download | bcm5719-llvm-1cbf3fa94a6ef7a3dd4f5d177aeed5ea3fa539bc.tar.gz bcm5719-llvm-1cbf3fa94a6ef7a3dd4f5d177aeed5ea3fa539bc.zip | |
Switch functions that returned bool and filled in a DWARFFormValue arg with ones that return Optional<DWARFFormValue>
Differential Revision: https://reviews.llvm.org/D27737
llvm-svn: 289611
Diffstat (limited to 'llvm/unittests/DebugInfo/DWARF')
| -rw-r--r-- | llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp b/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp index 95eec29ae38..3a418f8a985 100644 --- a/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp +++ b/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp @@ -227,33 +227,37 @@ void TestAllForms() { //---------------------------------------------------------------------- // Test block forms //---------------------------------------------------------------------- - DWARFFormValue FormValue; + Optional<DWARFFormValue> FormValue; ArrayRef<uint8_t> ExtractedBlockData; Optional<ArrayRef<uint8_t>> BlockDataOpt; - EXPECT_TRUE(DieDG.getAttributeValue(Attr_DW_FORM_block, FormValue)); - BlockDataOpt = FormValue.getAsBlock(); + FormValue = DieDG.getAttributeValue(Attr_DW_FORM_block); + EXPECT_TRUE((bool)FormValue); + BlockDataOpt = FormValue->getAsBlock(); EXPECT_TRUE(BlockDataOpt.hasValue()); ExtractedBlockData = BlockDataOpt.getValue(); EXPECT_EQ(ExtractedBlockData.size(), BlockSize); EXPECT_TRUE(memcmp(ExtractedBlockData.data(), BlockData, BlockSize) == 0); - EXPECT_TRUE(DieDG.getAttributeValue(Attr_DW_FORM_block1, FormValue)); - BlockDataOpt = FormValue.getAsBlock(); + FormValue = DieDG.getAttributeValue(Attr_DW_FORM_block1); + EXPECT_TRUE((bool)FormValue); + BlockDataOpt = FormValue->getAsBlock(); EXPECT_TRUE(BlockDataOpt.hasValue()); ExtractedBlockData = BlockDataOpt.getValue(); EXPECT_EQ(ExtractedBlockData.size(), BlockSize); EXPECT_TRUE(memcmp(ExtractedBlockData.data(), BlockData, BlockSize) == 0); - EXPECT_TRUE(DieDG.getAttributeValue(Attr_DW_FORM_block2, FormValue)); - BlockDataOpt = FormValue.getAsBlock(); + FormValue = DieDG.getAttributeValue(Attr_DW_FORM_block2); + EXPECT_TRUE((bool)FormValue); + BlockDataOpt = FormValue->getAsBlock(); EXPECT_TRUE(BlockDataOpt.hasValue()); ExtractedBlockData = BlockDataOpt.getValue(); EXPECT_EQ(ExtractedBlockData.size(), BlockSize); EXPECT_TRUE(memcmp(ExtractedBlockData.data(), BlockData, BlockSize) == 0); - EXPECT_TRUE(DieDG.getAttributeValue(Attr_DW_FORM_block4, FormValue)); - BlockDataOpt = FormValue.getAsBlock(); + FormValue = DieDG.getAttributeValue(Attr_DW_FORM_block4); + EXPECT_TRUE((bool)FormValue); + BlockDataOpt = FormValue->getAsBlock(); EXPECT_TRUE(BlockDataOpt.hasValue()); ExtractedBlockData = BlockDataOpt.getValue(); EXPECT_EQ(ExtractedBlockData.size(), BlockSize); |
