averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

use new llvm::Optional API

Browse Source 
`getValue` -> `value`
`getValueOr` -> `value_or`
`hasValue` -> `has_value`
`map` -> `transform`

The old API will be deprecated in the rebranch.
To avoid merge conflicts, use the new API already in the main branch.

rdar://102362022
This commit is contained in:
Erik Eckstein
2022-11-15 15:08:30 +01:00
parent 567b68aa6f
commit ab1b343dad
328 changed files with 1537 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -574,7 +574,7 @@ SerializedModuleLoaderBase::findModule(ImportPath::Element moduleID,
SerializedModuleBaseName
absoluteBaseName{currPath, targetSpecificBaseName};
if (!firstAbsoluteBaseName.hasValue())
if (!firstAbsoluteBaseName.has_value())
firstAbsoluteBaseName.emplace(absoluteBaseName);
auto result = findModuleFilesInDirectory(
@@ -781,7 +781,7 @@ LoadedFile *SerializedModuleLoaderBase::loadAST(
if (loadedModuleFile->isConcurrencyChecked())
M.setIsConcurrencyChecked();
M.setUserModuleVersion(loadedModuleFile->getUserModuleVersion());
auto diagLocOrInvalid = diagLoc.getValueOr(SourceLoc());
auto diagLocOrInvalid = diagLoc.value_or(SourceLoc());
loadInfo.status = loadedModuleFile->associateWithFileContext(
fileUnit, diagLocOrInvalid, Ctx.LangOpts.AllowModuleWithCompilerErrors);
@@ -806,7 +806,7 @@ LoadedFile *SerializedModuleLoaderBase::loadAST(
Ctx.bumpGeneration();
LoadedModuleFiles.emplace_back(std::move(loadedModuleFile),
Ctx.getCurrentGeneration());
findOverlayFiles(diagLoc.getValueOr(SourceLoc()), &M, fileUnit);
findOverlayFiles(diagLoc.value_or(SourceLoc()), &M, fileUnit);
} else {
fileUnit = nullptr;
}
@@ -833,7 +833,7 @@ LoadedFile *SerializedModuleLoaderBase::loadAST(
// If the imported module was built with -experimental-hermetic-seal-at-link
// but the current module isn't, error out.
if (M.hasHermeticSealAtLink() && !Ctx.LangOpts.HermeticSealAtLink) {
Ctx.Diags.diagnose(diagLoc.getValueOr(SourceLoc()),
Ctx.Diags.diagnose(diagLoc.value_or(SourceLoc()),
diag::need_hermetic_seal_to_import_module, M.getName());
}
@@ -949,7 +949,7 @@ void swift::serialization::diagnoseSerializedASTLoadFailure(
loadedModuleFile->getDependencies(),
[](const ModuleFile::Dependency &next) {
return next.isLoaded() &&
!(next.Import.hasValue() &&
!(next.Import.has_value() &&
next.Import->importedModule->hasResolvedImports());
});
assert(circularDependencyIter !=
@@ -1490,7 +1490,7 @@ void SerializedASTFile::lookupImportedSPIGroups(
auto M = getParentModule();
auto &imports = M->getASTContext().getImportCache();
for (auto &dep : File.Dependencies) {
if (!dep.Import.hasValue())
if (!dep.Import.has_value())
continue;
if (dep.Import->importedModule == importedModule ||