Skip to content

Commit 7d8bf37

Browse files
eecksteineeckstein
committed
change to the new llvm::Optional APIs
This is a follow-up of #62217
1 parent c285bab commit 7d8bf37

File tree

15 files changed

+59
-59
lines changed

15 files changed

+59
-59
lines changed

‎include/swift/SIL/FieldSensitivePrunedLiveness.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ class FieldSensitiveSSAPrunedLiveRange
693693

694694
bool isDef(SILInstruction *inst, TypeTreeLeafTypeRange span) const {
695695
return inst == defInst.first &&
696-
defInst.second->setIntersection(span).hasValue();
696+
defInst.second->setIntersection(span).has_value();
697697
}
698698

699699
bool isDefBlock(SILBasicBlock *block, unsigned bit) const {
@@ -764,7 +764,7 @@ class FieldSensitiveMultiDefPrunedLiveRange
764764
if (!iter)
765765
return false;
766766
return llvm::any_of(*iter, [&](TypeTreeLeafTypeRange storedSpan) {
767-
return span.setIntersection(storedSpan).hasValue();
767+
return span.setIntersection(storedSpan).has_value();
768768
});
769769
}
770770

@@ -789,7 +789,7 @@ class FieldSensitiveMultiDefPrunedLiveRange
789789
if (!iter)
790790
return false;
791791
return llvm::any_of(*iter, [&](TypeTreeLeafTypeRange storedSpan) {
792-
return span.setIntersection(storedSpan).hasValue();
792+
return span.setIntersection(storedSpan).has_value();
793793
});
794794
}
795795

@@ -798,7 +798,7 @@ class FieldSensitiveMultiDefPrunedLiveRange
798798
if (!iter)
799799
return false;
800800
return llvm::any_of(*iter, [&](TypeTreeLeafTypeRange storedSpan) {
801-
return span.setIntersection(storedSpan).hasValue();
801+
return span.setIntersection(storedSpan).has_value();
802802
});
803803
}
804804

‎lib/AST/ASTContext.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1897,7 +1897,7 @@ static void findPath_dfs(ModuleDependencyID X,
18971897
}
18981898
visited.insert(X);
18991899
auto optionalNode = cache.findDependency(X.first, X.second);
1900-
auto node = optionalNode.getValue();
1900+
auto node = optionalNode.value();
19011901
assert(optionalNode.has_value() && "Expected cache value for dependency.");
19021902
for (const auto &dep : node->getModuleImports()) {
19031903
Optional<ModuleDependencyKind> lookupKind = None;
@@ -1909,7 +1909,7 @@ static void findPath_dfs(ModuleDependencyID X,
19091909
auto optionalDepNode = cache.findDependency(dep, lookupKind);
19101910
if (!optionalDepNode.has_value())
19111911
continue;
1912-
auto depNode = optionalDepNode.getValue();
1912+
auto depNode = optionalDepNode.value();
19131913
auto depID = std::make_pair(dep, depNode->getKind());
19141914
if (!visited.count(depID)) {
19151915
findPath_dfs(depID, Y, visited, stack, result, cache);
@@ -1953,7 +1953,7 @@ static void diagnoseScannerFailure(StringRef moduleName,
19531953
const auto &entry = *it;
19541954
auto optionalEntryNode = cache.findDependency(entry.first, entry.second);
19551955
assert(optionalEntryNode.has_value());
1956-
auto entryNode = optionalEntryNode.getValue();
1956+
auto entryNode = optionalEntryNode.value();
19571957
std::string moduleFilePath = "";
19581958
bool isClang = false;
19591959
switch (entryNode->getKind()) {

‎lib/AST/ModuleDependencies.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,9 @@ void ModuleDependenciesCache::updateDependency(
454454
void ModuleDependenciesCache::resolveDependencyImports(ModuleDependencyID moduleID,
455455
const std::vector<ModuleDependencyID> &dependencyIDs) {
456456
auto optionalDependencyInfo = findDependency(moduleID.first, moduleID.second);
457-
assert(optionalDependencyInfo.hasValue() && "Resolving unknown dependency");
457+
assert(optionalDependencyInfo.has_value() && "Resolving unknown dependency");
458458
// Copy the existing info to a mutable one we can then replace it with, after resolving its dependencies.
459-
auto dependencyInfo = *(optionalDependencyInfo.getValue());
459+
auto dependencyInfo = *(optionalDependencyInfo.value());
460460
dependencyInfo.resolveDependencies(dependencyIDs);
461461
updateDependency(moduleID, dependencyInfo);
462462
}

‎lib/ClangImporter/ClangModuleDependencyScanner.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@ bool ClangImporter::addBridgingHeaderDependencies(
274274
ModuleDependenciesCache &cache) {
275275
auto &ctx = Impl.SwiftContext;
276276
auto optionalTargetModule = cache.findDependency(moduleName, moduleKind);
277-
assert(optionalTargetModule.hasValue());
278-
auto targetModule = *(optionalTargetModule.getValue());
277+
assert(optionalTargetModule.has_value());
278+
auto targetModule = *(optionalTargetModule.value());
279279

280280
// If we've already recorded bridging header dependencies, we're done.
281281
if (auto swiftInterfaceDeps = targetModule.getAsSwiftInterfaceModule()) {

‎lib/ConstExtract/ConstExtract.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static std::shared_ptr<CompileTimeValue> extractCompileTimeValue(Expr *expr) {
185185
case ExprKind::NilLiteral:
186186
case ExprKind::StringLiteral: {
187187
auto rawLiteral = extractRawLiteral(expr);
188-
if (rawLiteral.hasValue()) {
188+
if (rawLiteral.has_value()) {
189189
return std::make_shared<RawLiteralValue>(rawLiteral.value());
190190
}
191191

@@ -569,7 +569,7 @@ void writeValue(llvm::json::OStream &JSON,
569569
JSON.attribute("valueKind", "Enum");
570570
JSON.attributeObject("value", [&]() {
571571
JSON.attribute("name", enumValue->getIdentifier());
572-
if (enumValue->getParameters().hasValue()) {
572+
if (enumValue->getParameters().has_value()) {
573573
auto params = enumValue->getParameters().value();
574574
JSON.attributeArray("arguments", [&] {
575575
for (auto FP : params) {
@@ -595,7 +595,7 @@ void writeValue(llvm::json::OStream &JSON,
595595
void writeAttributes(
596596
llvm::json::OStream &JSON,
597597
llvm::Optional<std::vector<CustomAttrValue>> PropertyWrappers) {
598-
if (!PropertyWrappers.hasValue()) {
598+
if (!PropertyWrappers.has_value()) {
599599
return;
600600
}
601601

@@ -620,18 +620,18 @@ void writeAttributes(
620620
void writeEnumCases(
621621
llvm::json::OStream &JSON,
622622
llvm::Optional<std::vector<EnumElementDeclValue>> EnumElements) {
623-
if (!EnumElements.hasValue()) {
623+
if (!EnumElements.has_value()) {
624624
return;
625625
}
626626

627627
JSON.attributeArray("cases", [&] {
628628
for (const auto &Case : EnumElements.value()) {
629629
JSON.object([&] {
630630
JSON.attribute("name", Case.Name);
631-
if (Case.RawValue.hasValue()) {
631+
if (Case.RawValue.has_value()) {
632632
JSON.attribute("rawValue", Case.RawValue.value());
633633
}
634-
if (Case.Parameters.hasValue()) {
634+
if (Case.Parameters.has_value()) {
635635
JSON.attributeArray("parameters", [&] {
636636
for (const auto &Parameter : Case.Parameters.value()) {
637637
JSON.object([&] {
@@ -698,15 +698,15 @@ void writeAttrInformation(llvm::json::OStream &JSON,
698698
if (!attr->Rename.empty())
699699
JSON.attribute("rename", attr->Rename);
700700

701-
if (attr->Introduced.hasValue())
701+
if (attr->Introduced.has_value())
702702
JSON.attribute("introducedVersion",
703703
attr->Introduced.value().getAsString());
704704

705-
if (attr->Deprecated.hasValue())
705+
if (attr->Deprecated.has_value())
706706
JSON.attribute("deprecatedVersion",
707707
attr->Deprecated.value().getAsString());
708708

709-
if (attr->Obsoleted.hasValue())
709+
if (attr->Obsoleted.has_value())
710710
JSON.attribute("obsoletedVersion",
711711
attr->Obsoleted.value().getAsString());
712712

‎lib/DependencyScan/ModuleDependencyCacheSerialization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ void ModuleDependenciesCacheSerializer::collectStringsAndArrays(
10331033
for (auto &moduleID : cache.getAllNonSourceModules(contextHash)) {
10341034
auto optionalDependencyInfo = cache.findDependency(moduleID.first, moduleID.second);
10351035
assert(optionalDependencyInfo.has_value() && "Expected dependency info.");
1036-
auto dependencyInfo = optionalDependencyInfo.getValue();
1036+
auto dependencyInfo = optionalDependencyInfo.value();
10371037
// Add the module's name
10381038
addIdentifier(moduleID.first);
10391039
// Add the module's dependencies

‎lib/DependencyScan/ScanDependencies.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ static void findAllImportedClangModules(ASTContext &ctx, StringRef moduleName,
148148
allModules.push_back(moduleName.str());
149149
auto optionalDependencies =
150150
cache.findDependency(moduleName, ModuleDependencyKind::Clang);
151-
if (!optionalDependencies.hasValue())
151+
if (!optionalDependencies.has_value())
152152
return;
153153

154-
auto dependencies = optionalDependencies.getValue();
154+
auto dependencies = optionalDependencies.value();
155155
for (const auto &dep : dependencies->getModuleDependencies()) {
156156
findAllImportedClangModules(ctx, dep.first, cache, allModules, knownModules);
157157
}
@@ -165,8 +165,8 @@ resolveDirectDependencies(CompilerInstance &instance, ModuleDependencyID module,
165165
PrettyStackTraceStringAction trace("Resolving direct dependencies of: ", module.first);
166166
auto &ctx = instance.getASTContext();
167167
auto optionalKnownDependencies = cache.findDependency(module.first, module.second);
168-
assert(optionalKnownDependencies.hasValue());
169-
auto knownDependencies = optionalKnownDependencies.getValue();
168+
assert(optionalKnownDependencies.has_value());
169+
auto knownDependencies = optionalKnownDependencies.value();
170170

171171
// If this dependency has already been resolved, return the result.
172172
if (knownDependencies->isResolved() &&
@@ -189,7 +189,7 @@ resolveDirectDependencies(CompilerInstance &instance, ModuleDependencyID module,
189189
} else {
190190
if (auto found =
191191
ctx.getModuleDependencies(dependsOn, cache, ASTDelegate, module))
192-
result.insert({dependsOn, found.getValue()->getKind()});
192+
result.insert({dependsOn, found.value()->getKind()});
193193
}
194194
}
195195

@@ -241,14 +241,14 @@ resolveDirectDependencies(CompilerInstance &instance, ModuleDependencyID module,
241241
if (auto found =
242242
ctx.getSwiftModuleDependencies(clangDep, cache, ASTDelegate)) {
243243
if (clangDep != module.first)
244-
result.insert({clangDep, found.getValue()->getKind()});
244+
result.insert({clangDep, found.value()->getKind()});
245245
}
246246
}
247247
}
248248

249249
// Resolve the dependnecy info
250250
cache.resolveDependencyImports(module, result.takeVector());
251-
return cache.findDependency(module.first, module.second).getValue()->getModuleDependencies();
251+
return cache.findDependency(module.first, module.second).value()->getModuleDependencies();
252252
}
253253

254254
static void discoverCrossImportOverlayDependencies(
@@ -260,7 +260,7 @@ static void discoverCrossImportOverlayDependencies(
260260
llvm::SetVector<Identifier> newOverlays;
261261
for (auto dep : allDependencies) {
262262
auto moduleName = dep.first;
263-
auto dependencies = cache.findDependency(moduleName, dep.second).getValue();
263+
auto dependencies = cache.findDependency(moduleName, dep.second).value();
264264

265265
// Collect a map from secondary module name to cross-import overlay names.
266266
auto overlayMap = dependencies->collectCrossImportOverlayNames(
@@ -323,7 +323,7 @@ static void discoverCrossImportOverlayDependencies(
323323

324324
// Update main module's dependencies to include these new overlays.
325325
auto mainDep = *(cache.findDependency(
326-
mainModuleName, ModuleDependencyKind::SwiftSource).getValue());
326+
mainModuleName, ModuleDependencyKind::SwiftSource).value());
327327
std::for_each(/* +1 to exclude dummy main*/ allModules.begin() + 1,
328328
allModules.end(),
329329
[&](ModuleDependencyID dependencyID) {
@@ -835,8 +835,8 @@ generateFullDependencyGraph(CompilerInstance &instance,
835835
}
836836

837837
auto optionalDepInfo = cache.findDependency(module.first, module.second);
838-
assert(optionalDepInfo.hasValue() && "Missing dependency info during graph generation diagnosis.");
839-
auto depInfo = optionalDepInfo.getValue();
838+
assert(optionalDepInfo.has_value() && "Missing dependency info during graph generation diagnosis.");
839+
auto depInfo = optionalDepInfo.value();
840840
auto directDependencies = depInfo->getModuleDependencies();
841841

842842
// Generate a swiftscan_clang_details_t object based on the dependency kind
@@ -967,8 +967,8 @@ static bool diagnoseCycle(CompilerInstance &instance,
967967
auto beforeSize = openSet.size();
968968

969969
auto optionalDepInfo = cache.findDependency(lastOpen.first, lastOpen.second);
970-
assert(optionalDepInfo.hasValue() && "Missing dependency info during cycle diagnosis.");
971-
auto depInfo = optionalDepInfo.getValue();
970+
assert(optionalDepInfo.has_value() && "Missing dependency info during cycle diagnosis.");
971+
auto depInfo = optionalDepInfo.value();
972972

973973
for (const auto &dep : depInfo->getModuleDependencies()) {
974974
if (closeSet.count(dep))
@@ -1459,7 +1459,7 @@ swift::dependencies::performModuleScan(CompilerInstance &instance,
14591459
// Verify that all collected dependencies have had their
14601460
// imports resolved to module IDs
14611461
for (const auto &moduleID : allModules) {
1462-
const auto &moduleInfo = cache.findDependency(moduleID.first, moduleID.second).getValue();
1462+
const auto &moduleInfo = cache.findDependency(moduleID.first, moduleID.second).value();
14631463
assert(moduleInfo->isResolved());
14641464
}
14651465
#endif
@@ -1474,9 +1474,9 @@ swift::dependencies::performModuleScan(CompilerInstance &instance,
14741474
if (auto depTracker = instance.getDependencyTracker()) {
14751475
for (auto module : allModules) {
14761476
auto optionalDeps = cache.findDependency(module.first, module.second);
1477-
if (!optionalDeps.hasValue())
1477+
if (!optionalDeps.has_value())
14781478
continue;
1479-
auto deps = optionalDeps.getValue();
1479+
auto deps = optionalDeps.value();
14801480

14811481
if (auto swiftDeps = deps->getAsSwiftInterfaceModule()) {
14821482
depTracker->addDependency(swiftDeps->swiftInterfaceFile,
@@ -1557,7 +1557,7 @@ swift::dependencies::performBatchModuleScan(
15571557
rootDeps =
15581558
ctx.getSwiftModuleDependencies(moduleName, cache, ASTDelegate);
15591559
}
1560-
if (!rootDeps.hasValue()) {
1560+
if (!rootDeps.has_value()) {
15611561
// We cannot find the clang module, abort.
15621562
batchScanResult.push_back(
15631563
std::make_error_code(std::errc::invalid_argument));
@@ -1633,7 +1633,7 @@ swift::dependencies::performBatchModulePrescan(
16331633
}
16341634

16351635
auto *importSet = new swiftscan_import_set_s;
1636-
importSet->imports = create_set(rootDeps.getValue()->getModuleImports());
1636+
importSet->imports = create_set(rootDeps.value()->getModuleImports());
16371637
batchPrescanResult.push_back(importSet);
16381638
});
16391639

‎lib/IDETool/DependencyChecking.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ forEachDependencyUntilTrue(CompilerInstance &CI,
2727
llvm::function_ref<bool(StringRef)> callback) {
2828
// Check files in the current module. If 'excludeBufferID' is None, exclude
2929
// all source files.
30-
if (excludeBufferID.hasValue()) {
30+
if (excludeBufferID.has_value()) {
3131
for (FileUnit *file : CI.getMainModule()->getFiles()) {
3232
StringRef filename;
3333
if (auto SF = dyn_cast<SourceFile>(file)) {

‎lib/IDETool/IDEInspectionInstance.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ void IDEInspectionInstance::performNewOperation(
452452
llvm::PrettyStackTraceString trace("While performing new IDE inspection");
453453

454454
// If ArgsHash is None we shouldn't cache the compiler instance.
455-
bool ShouldCacheCompilerInstance = ArgsHash.hasValue();
455+
bool ShouldCacheCompilerInstance = ArgsHash.has_value();
456456

457457
auto CI = std::make_shared<CompilerInstance>();
458458

0 commit comments

Comments
 (0)