[DebugInfo] llvm::Optional => std::optional

https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716

1 files changed, 13 insertions, 13 deletions

diff --git a/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp b/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
index 3f113d6..4473c5a 100644
--- a/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
+++ b/llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
@@ -245,9 +245,9 @@ void TestAllForms() {
   //----------------------------------------------------------------------
   // Test block forms
   //----------------------------------------------------------------------
-  Optional<DWARFFormValue> FormValue;
+  std::optional<DWARFFormValue> FormValue;
   ArrayRef<uint8_t> ExtractedBlockData;
-  Optional<ArrayRef<uint8_t>> BlockDataOpt;
+  std::optional<ArrayRef<uint8_t>> BlockDataOpt;
 
   FormValue = DieDG.find(Attr_DW_FORM_block);
   EXPECT_TRUE((bool)FormValue);
@@ -937,7 +937,7 @@ template <uint16_t Version, class AddrType> void TestAddresses() {
   EXPECT_TRUE(DieDG.isValid());
 
   uint64_t LowPC, HighPC, SectionIndex;
-  Optional<uint64_t> OptU64;
+  std::optional<uint64_t> OptU64;
   // Verify the that our subprogram with no PC value fails appropriately when
   // asked for any PC values.
   auto SubprogramDieNoPC = DieDG.getFirstChild();
@@ -1118,14 +1118,14 @@ TEST(DWARFDebugInfo, TestStringOffsets) {
   ASSERT_TRUE((bool)Extracted1);
   EXPECT_STREQ(String1, *Extracted1);
 
-  Optional<DWARFFormValue> Form2 = DieDG.find(Attr2);
+  std::optional<DWARFFormValue> Form2 = DieDG.find(Attr2);
   ASSERT_TRUE((bool)Form2);
   EXPECT_EQ(0u, Form2->getRawUValue());
   auto Extracted2 = toString(Form2);
   ASSERT_TRUE((bool)Extracted2);
   EXPECT_STREQ(String2, *Extracted2);
 
-  Optional<DWARFFormValue> Form3 = DieDG.find(Attr3);
+  std::optional<DWARFFormValue> Form3 = DieDG.find(Attr3);
   ASSERT_TRUE((bool)Form3);
   EXPECT_EQ(1u, Form3->getRawUValue());
   auto Extracted3 = toString(Form3);
@@ -1632,13 +1632,13 @@ TEST(DWARFDebugInfo, TestFindRecurse) {
 
 TEST(DWARFDebugInfo, TestDwarfToFunctions) {
   // Test all of the dwarf::toXXX functions that take a
-  // Optional<DWARFFormValue> and extract the values from it.
+  // std::optional<DWARFFormValue> and extract the values from it.
   uint64_t InvalidU64 = 0xBADBADBADBADBADB;
   int64_t InvalidS64 = 0xBADBADBADBADBADB;
 
   // First test that we don't get valid values back when using an optional with
   // no value.
-  Optional<DWARFFormValue> FormValOpt1 = DWARFFormValue();
+  std::optional<DWARFFormValue> FormValOpt1 = DWARFFormValue();
   EXPECT_FALSE(toString(FormValOpt1).has_value());
   EXPECT_FALSE(toUnsigned(FormValOpt1).has_value());
   EXPECT_FALSE(toReference(FormValOpt1).has_value());
@@ -1655,7 +1655,7 @@ TEST(DWARFDebugInfo, TestDwarfToFunctions) {
 
   // Test successful and unsuccessful address decoding.
   uint64_t Address = 0x100000000ULL;
-  Optional<DWARFFormValue> FormValOpt2 =
+  std::optional<DWARFFormValue> FormValOpt2 =
       DWARFFormValue::createFromUValue(DW_FORM_addr, Address);
 
   EXPECT_FALSE(toString(FormValOpt2).has_value());
@@ -1674,7 +1674,7 @@ TEST(DWARFDebugInfo, TestDwarfToFunctions) {
 
   // Test successful and unsuccessful unsigned constant decoding.
   uint64_t UData8 = 0x1020304050607080ULL;
-  Optional<DWARFFormValue> FormValOpt3 =
+  std::optional<DWARFFormValue> FormValOpt3 =
       DWARFFormValue::createFromUValue(DW_FORM_udata, UData8);
 
   EXPECT_FALSE(toString(FormValOpt3).has_value());
@@ -1693,7 +1693,7 @@ TEST(DWARFDebugInfo, TestDwarfToFunctions) {
 
   // Test successful and unsuccessful reference decoding.
   uint32_t RefData = 0x11223344U;
-  Optional<DWARFFormValue> FormValOpt4 =
+  std::optional<DWARFFormValue> FormValOpt4 =
       DWARFFormValue::createFromUValue(DW_FORM_ref_addr, RefData);
 
   EXPECT_FALSE(toString(FormValOpt4).has_value());
@@ -1712,7 +1712,7 @@ TEST(DWARFDebugInfo, TestDwarfToFunctions) {
 
   // Test successful and unsuccessful signed constant decoding.
   int64_t SData8 = 0x1020304050607080ULL;
-  Optional<DWARFFormValue> FormValOpt5 =
+  std::optional<DWARFFormValue> FormValOpt5 =
       DWARFFormValue::createFromSValue(DW_FORM_udata, SData8);
 
   EXPECT_FALSE(toString(FormValOpt5).has_value());
@@ -1732,7 +1732,7 @@ TEST(DWARFDebugInfo, TestDwarfToFunctions) {
   // Test successful and unsuccessful block decoding.
   uint8_t Data[] = { 2, 3, 4 };
   ArrayRef<uint8_t> Array(Data);
-  Optional<DWARFFormValue> FormValOpt6 =
+  std::optional<DWARFFormValue> FormValOpt6 =
       DWARFFormValue::createFromBlockValue(DW_FORM_block1, Array);
 
   EXPECT_FALSE(toString(FormValOpt6).has_value());
@@ -1873,7 +1873,7 @@ TEST(DWARFDebugInfo, TestImplicitConstAbbrevs) {
     auto A = it->getAttrByIndex(0);
     EXPECT_EQ(A, Attr);
 
-    Optional<uint32_t> AttrIndex = it->findAttributeIndex(A);
+    std::optional<uint32_t> AttrIndex = it->findAttributeIndex(A);
     EXPECT_TRUE((bool)AttrIndex);
     EXPECT_EQ(*AttrIndex, 0u);
     uint64_t OffsetVal =