[Bitcode] Use std::nullopt instead of None (NFC)

This patch mechanically replaces None with std::nullopt where the
compiler would warn if None were deprecated.  The intent is to reduce
the amount of manual work required in migrating from Optional to
std::optional.

This is part of an effort to migrate from llvm::Optional to
std::optional:

https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716
This commit is contained in:
Kazu Hirata
2022-12-02 20:36:04 -08:00
parent e842c06c2d
commit e9e64f7c9e
6 changed files with 46 additions and 42 deletions

View File

@@ -554,7 +554,7 @@ public:
Optional<unsigned> getInRangeIndex() const {
assert(Opcode == Instruction::GetElementPtr);
if (Extra == (unsigned)-1)
return None;
return std::nullopt;
return Extra;
}
@@ -822,7 +822,9 @@ private:
Error parseAttrKind(uint64_t Code, Attribute::AttrKind *Kind);
Error parseModule(
uint64_t ResumeBit, bool ShouldLazyLoadMetadata = false,
DataLayoutCallbackTy DataLayoutCallback = [](StringRef) { return None; });
DataLayoutCallbackTy DataLayoutCallback = [](StringRef) {
return std::nullopt;
});
Error parseComdatRecord(ArrayRef<uint64_t> Record);
Error parseGlobalVarRecord(ArrayRef<uint64_t> Record);
@@ -7915,7 +7917,7 @@ Expected<std::unique_ptr<Module>>
BitcodeModule::getLazyModule(LLVMContext &Context, bool ShouldLazyLoadMetadata,
bool IsImporting) {
return getModuleImpl(Context, false, ShouldLazyLoadMetadata, IsImporting,
[](StringRef) { return None; });
[](StringRef) { return std::nullopt; });
}
// Parse the specified bitcode buffer and merge the index into CombinedIndex.