diff options
| author | Fangrui Song <i@maskray.me> | 2022-12-04 21:36:08 +0000 |
|---|---|---|
| committer | Fangrui Song <i@maskray.me> | 2022-12-04 21:36:08 +0000 |
| commit | f4c16c44737caac25bf09ec2d85809820579ae40 (patch) | |
| tree | 4eae73487985fbe84f3b64a5be5ac52c88ff0cbb /llvm/tools/llvm-objdump/llvm-objdump.cpp | |
| parent | 12f6ac39bcc0957d66b68650fb830e12fb15b3a1 (diff) | |
| download | llvm-f4c16c44737caac25bf09ec2d85809820579ae40.zip llvm-f4c16c44737caac25bf09ec2d85809820579ae40.tar.gz llvm-f4c16c44737caac25bf09ec2d85809820579ae40.tar.bz2 | |
[MC] llvm::Optional => std::optional
https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index e15054d..565e232 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -863,7 +863,7 @@ addDynamicElfSymbols(const ELFObjectFileBase &Obj, llvm_unreachable("Unsupported binary format"); } -static Optional<SectionRef> getWasmCodeSection(const WasmObjectFile &Obj) { +static std::optional<SectionRef> getWasmCodeSection(const WasmObjectFile &Obj) { for (auto SecI : Obj.sections()) { const WasmSection &Section = Obj.getWasmSection(SecI); if (Section.Type == wasm::WASM_SEC_CODE) @@ -875,7 +875,7 @@ static Optional<SectionRef> getWasmCodeSection(const WasmObjectFile &Obj) { static void addMissingWasmCodeSymbols(const WasmObjectFile &Obj, std::map<SectionRef, SectionSymbolsTy> &AllSymbols) { - Optional<SectionRef> Section = getWasmCodeSection(Obj); + std::optional<SectionRef> Section = getWasmCodeSection(Obj); if (!Section) return; SectionSymbolsTy &Symbols = AllSymbols[*Section]; @@ -1084,7 +1084,7 @@ SymbolInfoTy objdump::createSymbolInfo(const ObjectFile &Obj, DataRefImpl SymbolDRI = Symbol.getRawDataRefImpl(); const uint32_t SymbolIndex = XCOFFObj.getSymbolIndex(SymbolDRI.p); - Optional<XCOFF::StorageMappingClass> Smc = + std::optional<XCOFF::StorageMappingClass> Smc = getXCOFFSymbolCsectSMC(XCOFFObj, Symbol); return SymbolInfoTy(Addr, Name, Smc, SymbolIndex, isLabel(XCOFFObj, Symbol)); @@ -1823,7 +1823,7 @@ static void disassembleObject(const Target *TheTarget, ObjectFile &Obj, bool PrintTarget = MIA->evaluateBranch(Inst, SectionAddr + Index, Size, Target); if (!PrintTarget) - if (Optional<uint64_t> MaybeTarget = + if (std::optional<uint64_t> MaybeTarget = MIA->evaluateMemoryOperandAddress( Inst, STI, SectionAddr + Index, Size)) { Target = *MaybeTarget; @@ -2480,7 +2480,7 @@ void objdump::printSymbol(const ObjectFile &O, const SymbolRef &Symbol, StringRef SectionName = unwrapOrError(Section->getName(), FileName); outs() << SectionName; if (O.isXCOFF()) { - Optional<SymbolRef> SymRef = + std::optional<SymbolRef> SymRef = getXCOFFSymbolContainingSymbolRef(cast<XCOFFObjectFile>(O), Symbol); if (SymRef) { |