From aa8feeefd3ac6c78ee8f67bf033976fc7d68bc6d Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 25 Jun 2022 11:55:57 -0700 Subject: Don't use Optional::hasValue (NFC) --- llvm/unittests/ObjectYAML/DWARFYAMLTest.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'llvm/unittests/ObjectYAML/DWARFYAMLTest.cpp') diff --git a/llvm/unittests/ObjectYAML/DWARFYAMLTest.cpp b/llvm/unittests/ObjectYAML/DWARFYAMLTest.cpp index 91febff..09c9e35 100644 --- a/llvm/unittests/ObjectYAML/DWARFYAMLTest.cpp +++ b/llvm/unittests/ObjectYAML/DWARFYAMLTest.cpp @@ -91,8 +91,8 @@ debug_pubtypes: DWARFYAML::Data Data; ASSERT_THAT_ERROR(parseDWARFYAML(Yaml, Data), Succeeded()); - ASSERT_TRUE(Data.PubNames.hasValue()); - DWARFYAML::PubSection PubNames = Data.PubNames.getValue(); + ASSERT_TRUE(Data.PubNames.has_value()); + DWARFYAML::PubSection PubNames = Data.PubNames.value(); ASSERT_EQ(PubNames.Entries.size(), 2u); EXPECT_EQ((uint32_t)PubNames.Entries[0].DieOffset, 0x1234u); @@ -100,8 +100,8 @@ debug_pubtypes: EXPECT_EQ((uint32_t)PubNames.Entries[1].DieOffset, 0x4321u); EXPECT_EQ(PubNames.Entries[1].Name, "def"); - ASSERT_TRUE(Data.PubTypes.hasValue()); - DWARFYAML::PubSection PubTypes = Data.PubTypes.getValue(); + ASSERT_TRUE(Data.PubTypes.has_value()); + DWARFYAML::PubSection PubTypes = Data.PubTypes.value(); ASSERT_EQ(PubTypes.Entries.size(), 2u); EXPECT_EQ((uint32_t)PubTypes.Entries[0].DieOffset, 0x1234u); @@ -157,8 +157,8 @@ debug_gnu_pubtypes: DWARFYAML::Data Data; ASSERT_THAT_ERROR(parseDWARFYAML(Yaml, Data), Succeeded()); - ASSERT_TRUE(Data.GNUPubNames.hasValue()); - DWARFYAML::PubSection GNUPubNames = Data.GNUPubNames.getValue(); + ASSERT_TRUE(Data.GNUPubNames.has_value()); + DWARFYAML::PubSection GNUPubNames = Data.GNUPubNames.value(); ASSERT_EQ(GNUPubNames.Entries.size(), 2u); EXPECT_EQ((uint32_t)GNUPubNames.Entries[0].DieOffset, 0x1234u); @@ -168,8 +168,8 @@ debug_gnu_pubtypes: EXPECT_EQ((uint8_t)GNUPubNames.Entries[1].Descriptor, 0x34); EXPECT_EQ(GNUPubNames.Entries[1].Name, "def"); - ASSERT_TRUE(Data.GNUPubTypes.hasValue()); - DWARFYAML::PubSection GNUPubTypes = Data.GNUPubTypes.getValue(); + ASSERT_TRUE(Data.GNUPubTypes.has_value()); + DWARFYAML::PubSection GNUPubTypes = Data.GNUPubTypes.value(); ASSERT_EQ(GNUPubTypes.Entries.size(), 2u); EXPECT_EQ((uint32_t)GNUPubTypes.Entries[0].DieOffset, 0x1234u); -- cgit v1.1