diff options
| author | Fangrui Song <i@maskray.me> | 2022-12-05 00:09:22 +0000 |
|---|---|---|
| committer | Fangrui Song <i@maskray.me> | 2022-12-05 00:09:22 +0000 |
| commit | 89fab98e884f05076bbd420d95b5de3596f5452c (patch) | |
| tree | 234f5a4340cc34680ffad9872f48dbdb8132ac96 /llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp | |
| parent | 35b4fbb559d909a7edf64412c665e99748398ac4 (diff) | |
| download | llvm-89fab98e884f05076bbd420d95b5de3596f5452c.zip llvm-89fab98e884f05076bbd420d95b5de3596f5452c.tar.gz llvm-89fab98e884f05076bbd420d95b5de3596f5452c.tar.bz2 | |
[DebugInfo] llvm::Optional => std::optional
https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716
Diffstat (limited to 'llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp')
| -rw-r--r-- | llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp index cc7f353..59e7361 100644 --- a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp +++ b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp @@ -137,8 +137,7 @@ static alias DumpAllAlias("a", desc("Alias for --all"), aliasopt(DumpAll), // Options for dumping specific sections. static unsigned DumpType = DIDT_Null; -static std::array<llvm::Optional<uint64_t>, (unsigned)DIDT_ID_Count> - DumpOffsets; +static std::array<std::optional<uint64_t>, (unsigned)DIDT_ID_Count> DumpOffsets; #define HANDLE_DWARF_SECTION(ENUM_NAME, ELF_NAME, CMDLINE_NAME, OPTION) \ static opt<OPTION> Dump##ENUM_NAME(CMDLINE_NAME, \ desc("Dump the " ELF_NAME " section"), \ @@ -386,7 +385,7 @@ static void filterByName(const StringSet<> &Names, static void getDies(DWARFContext &DICtx, const AppleAcceleratorTable &Accel, StringRef Name, SmallVectorImpl<DWARFDie> &Dies) { for (const auto &Entry : Accel.equal_range(Name)) { - if (llvm::Optional<uint64_t> Off = Entry.getDIESectionOffset()) { + if (std::optional<uint64_t> Off = Entry.getDIESectionOffset()) { if (DWARFDie Die = DICtx.getDIEForOffset(*Off)) Dies.push_back(Die); } @@ -395,8 +394,8 @@ static void getDies(DWARFContext &DICtx, const AppleAcceleratorTable &Accel, static DWARFDie toDie(const DWARFDebugNames::Entry &Entry, DWARFContext &DICtx) { - llvm::Optional<uint64_t> CUOff = Entry.getCUOffset(); - llvm::Optional<uint64_t> Off = Entry.getDIEUnitOffset(); + std::optional<uint64_t> CUOff = Entry.getCUOffset(); + std::optional<uint64_t> Off = Entry.getDIEUnitOffset(); if (!CUOff || !Off) return DWARFDie(); @@ -404,7 +403,7 @@ static DWARFDie toDie(const DWARFDebugNames::Entry &Entry, if (!CU) return DWARFDie(); - if (llvm::Optional<uint64_t> DWOId = CU->getDWOId()) { + if (std::optional<uint64_t> DWOId = CU->getDWOId()) { // This is a skeleton unit. Look up the DIE in the DWO unit. CU = DICtx.getDWOCompileUnitForHash(*DWOId); if (!CU) @@ -477,7 +476,7 @@ static bool collectLineTableSources(const DWARFDebugLine::LineTable <, StringRef CompDir, std::vector<std::string> &Sources) { bool Result = true; - llvm::Optional<uint64_t> LastIndex = LT.getLastValidFileIndex(); + std::optional<uint64_t> LastIndex = LT.getLastValidFileIndex(); for (uint64_t I = LT.hasFileAtIndex(0) ? 0 : 1, E = LastIndex ? *LastIndex + 1 : 0; I < E; ++I) { |