[BOLT][NFC] Use std::optional in DWARFRewriter

1 files changed, 11 insertions, 11 deletions

diff --git a/bolt/include/bolt/Rewrite/DWARFRewriter.h b/bolt/include/bolt/Rewrite/DWARFRewriter.h
index de292fd68b84..65e2a3d10cd4 100644
--- a/bolt/include/bolt/Rewrite/DWARFRewriter.h
+++ b/bolt/include/bolt/Rewrite/DWARFRewriter.h
@@ -98,7 +98,7 @@ private:
                            DebugAbbrevWriter &AbbrevWriter,
                            DebugLocWriter &DebugLocWriter,
                            DebugRangesSectionWriter &RangesWriter,
-                           Optional<uint64_t> RangesBase = std::nullopt);
+                           std::optional<uint64_t> RangesBase = std::nullopt);
 
   /// Patches the binary for an object's address ranges to be updated.
   /// The object can be anything that has associated address ranges via either
@@ -112,7 +112,7 @@ private:
   void updateDWARFObjectAddressRanges(
       const DWARFDie DIE, uint64_t DebugRangesOffset,
       SimpleBinaryPatcher &DebugInfoPatcher, DebugAbbrevWriter &AbbrevWriter,
-      uint64_t LowPCToUse, Optional<uint64_t> RangesBase = std::nullopt);
+      uint64_t LowPCToUse, std::optional<uint64_t> RangesBase = std::nullopt);
 
   std::unique_ptr<DebugBufferVector>
   makeFinalLocListsSection(DebugInfoBinaryPatcher &DebugInfoPatcher,
@@ -160,19 +160,19 @@ private:
 
   /// Convert \p Abbrev from using a simple DW_AT_(low|high)_pc range to
   /// DW_AT_ranges with optional \p RangesBase.
-  void convertToRangesPatchAbbrev(const DWARFUnit &Unit,
-                                  const DWARFAbbreviationDeclaration *Abbrev,
-                                  DebugAbbrevWriter &AbbrevWriter,
-                                  Optional<uint64_t> RangesBase = std::nullopt);
+  void
+  convertToRangesPatchAbbrev(const DWARFUnit &Unit,
+                             const DWARFAbbreviationDeclaration *Abbrev,
+                             DebugAbbrevWriter &AbbrevWriter,
+                             std::optional<uint64_t> RangesBase = std::nullopt);
 
   /// Update \p DIE that was using DW_AT_(low|high)_pc with DW_AT_ranges offset.
   /// Updates to the DIE should be synced with abbreviation updates using the
   /// function above.
-  void
-  convertToRangesPatchDebugInfo(DWARFDie DIE, uint64_t RangesSectionOffset,
-                                SimpleBinaryPatcher &DebugInfoPatcher,
-                                uint64_t LowPCToUse,
-                                Optional<uint64_t> RangesBase = std::nullopt);
+  void convertToRangesPatchDebugInfo(
+      DWARFDie DIE, uint64_t RangesSectionOffset,
+      SimpleBinaryPatcher &DebugInfoPatcher, uint64_t LowPCToUse,
+      std::optional<uint64_t> RangesBase = std::nullopt);
 
   /// Helper function for creating and returning per-DWO patchers/writers.
   template <class T, class Patcher>