Skip to content

Update llvm::Optional API uses #63227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2023
Merged

Update llvm::Optional API uses #63227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/swift/Basic/BlotMapVector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class BlotMapVector {
if (Iter == Map.end())
return ValueT();
auto &P = Vector[Iter->second];
if (!P.hasValue())
if (!P.has_value())
return ValueT();
return P->second;
}
Expand Down
8 changes: 4 additions & 4 deletions include/swift/Basic/SuccessorMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,13 +375,13 @@ class SuccessorMap {
assert(Traits::precedes(node->Begin, node->End));

// The first key must be strictly higher than the lower bound.
if (lowerBound.hasValue())
assert(Traits::precedes(lowerBound.getValue(), node->Begin));
if (lowerBound.has_value())
assert(Traits::precedes(lowerBound.value(), node->Begin));

// The last key (i.e. End-1) must be strictly lower than
// upperBound-1, or in other words, End must precede upperBound.
if (upperBound.hasValue())
assert(Traits::precedes(node->End, upperBound.getValue()));
if (upperBound.has_value())
assert(Traits::precedes(node->End, upperBound.value()));

// The keys in the left sub-tree must all be strictly less than
// Begin-1, because if any key equals Begin-1, that node should
Expand Down
2 changes: 1 addition & 1 deletion lib/Basic/Unix/TaskQueue.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ TaskProcessInformation::TaskProcessInformation(ProcessId Pid, struct rusage Usag
Usage.ru_maxrss) {
#ifndef __APPLE__
// Apple systems report bytes; everything else appears to report KB.
this->ProcessUsage.getValue().Maxrss <<= 10;
this->ProcessUsage.value().Maxrss <<= 10;
#endif // __APPLE__
}
#endif // defined(HAVE_GETRUSAGE) && !defined(__HAIKU__)
Expand Down
16 changes: 8 additions & 8 deletions tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-InProc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,8 @@ class SKDObjectVisitor {
return static_cast<ImplClass*>(this)->visitString(CString);
}
auto OptInt = Object->getInt64();
if (OptInt.hasValue()) {
return static_cast<ImplClass*>(this)->visitInt64(OptInt.getValue());
if (OptInt.has_value()) {
return static_cast<ImplClass*>(this)->visitInt64(OptInt.value());
}
llvm_unreachable("unknown sourcekitd_object_t");
}
Expand Down Expand Up @@ -789,15 +789,15 @@ bool RequestDict::getInt64(SourceKit::UIdent Key, int64_t &Val,
auto Object = static_cast<SKDObject *>(Dict)->get(SKDUIDFromUIdent(Key));
if (!Object)
return !isOptional;
Val = Object->getInt64().getValueOr(0);
Val = Object->getInt64().value_or(0);
return false;
}

Optional<int64_t> RequestDict::getOptionalInt64(SourceKit::UIdent Key) const {
auto Object = static_cast<SKDObject *>(Dict)->get(SKDUIDFromUIdent(Key));
if (!Object)
return None;
return Object->getInt64().getValueOr(0);
return Object->getInt64().value_or(0);
}

sourcekitd_response_t
Expand Down Expand Up @@ -849,7 +849,7 @@ static size_t SKDVar_array_get_count(sourcekitd_variant_t array) {
}

static int64_t SKDVar_array_get_int64(sourcekitd_variant_t array, size_t index) {
return SKD_OBJ(array)->get(index)->getInt64().getValueOr(0);
return SKD_OBJ(array)->get(index)->getInt64().value_or(0);
}

static const char *
Expand Down Expand Up @@ -891,7 +891,7 @@ SKDVar_dictionary_get_bool(sourcekitd_variant_t dict, sourcekitd_uid_t key) {
static int64_t
SKDVar_dictionary_get_int64(sourcekitd_variant_t dict, sourcekitd_uid_t key) {
if (auto Object = SKD_OBJ(dict)->get(key)) {
return Object->getInt64().getValueOr(0);
return Object->getInt64().value_or(0);
}
return 0;
}
Expand Down Expand Up @@ -919,15 +919,15 @@ SKDVar_dictionary_get_uid(sourcekitd_variant_t dict, sourcekitd_uid_t key) {

static size_t SKDVar_string_get_length(sourcekitd_variant_t obj) {
auto String = SKD_OBJ(obj)->getString();
return String.hasValue() ? String->size() : 0;
return String.has_value() ? String->size() : 0;
}

static const char *SKDVar_string_get_ptr(sourcekitd_variant_t obj) {
return SKD_OBJ(obj)->getCString();
}

static int64_t SKDVar_int64_get_value(sourcekitd_variant_t obj) {
return SKD_OBJ(obj)->getInt64().getValueOr(0);
return SKD_OBJ(obj)->getInt64().value_or(0);
}

static sourcekitd_uid_t SKDVar_uid_get_value(sourcekitd_variant_t obj) {
Expand Down
6 changes: 3 additions & 3 deletions unittests/Basic/BlotMapVectorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,9 +632,9 @@ TEST(BlotMapVectorCustomTest, FindAsTest) {

// Normal lookup tests
EXPECT_EQ(1u, map.count(1));
EXPECT_EQ(1u, map.find(0)->getValue().second);
EXPECT_EQ(2u, map.find(1)->getValue().second);
EXPECT_EQ(3u, map.find(2)->getValue().second);
EXPECT_EQ(1u, map.find(0)->value().second);
EXPECT_EQ(2u, map.find(1)->value().second);
EXPECT_EQ(3u, map.find(2)->value().second);
EXPECT_TRUE(map.find(3) == map.end());
}

Expand Down
8 changes: 4 additions & 4 deletions unittests/Basic/EditorPlaceholderTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ TEST(EditorPlaceholder, EditorPlaceholders) {
TEST(EditorPlaceholder, InvalidEditorPlaceholders) {
const char *Text = "<#foo";
Optional<EditorPlaceholderData> DataOpt = parseEditorPlaceholder(Text);
EXPECT_FALSE(DataOpt.hasValue());
EXPECT_FALSE(DataOpt.has_value());

Text = "foo#>";
DataOpt = parseEditorPlaceholder(Text);
EXPECT_FALSE(DataOpt.hasValue());
EXPECT_FALSE(DataOpt.has_value());

Text = "#foo#>";
DataOpt = parseEditorPlaceholder(Text);
EXPECT_FALSE(DataOpt.hasValue());
EXPECT_FALSE(DataOpt.has_value());

Text = " <#foo#>";
DataOpt = parseEditorPlaceholder(Text);
EXPECT_FALSE(DataOpt.hasValue());
EXPECT_FALSE(DataOpt.has_value());
}
4 changes: 2 additions & 2 deletions unittests/Basic/FrozenMultiMapTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ TEST(FrozenMultiMapCustomTest, SimpleFind) {
EXPECT_EQ(map.size(), 5u);
{
auto r = map.find(key1);
EXPECT_TRUE(r.hasValue());
EXPECT_TRUE(r.has_value());
EXPECT_EQ(r->size(), 3u);
EXPECT_EQ((*r)[0].getID(), 2u);
EXPECT_EQ((*r)[1].getID(), 3u);
Expand All @@ -84,7 +84,7 @@ TEST(FrozenMultiMapCustomTest, SimpleFind) {

{
auto r = map.find(key2);
EXPECT_TRUE(r.hasValue());
EXPECT_TRUE(r.has_value());
EXPECT_EQ(r->size(), 2u);
EXPECT_EQ((*r)[0].getID(), 5u);
EXPECT_EQ((*r)[1].getID(), 6u);
Expand Down
6 changes: 3 additions & 3 deletions unittests/Driver/MockingFineGrainedDependencyGraphs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ mocking_fine_grained_dependency_graphs::getChangesForSimulatedLoad(
auto swiftDeps =
cmd->getOutput().getAdditionalOutputForType(file_types::TY_SwiftDeps).str();
auto swiftDepsFingerprint =
swift::mockFingerprintFromString(swiftDeps).getValue();
auto interfaceHash = interfaceHashIfNonEmpty.getValueOr(swiftDepsFingerprint);
swift::mockFingerprintFromString(swiftDeps).value();
auto interfaceHash = interfaceHashIfNonEmpty.value_or(swiftDepsFingerprint);

SourceManager sm;
DiagnosticEngine diags(sm);
Expand All @@ -70,7 +70,7 @@ mocking_fine_grained_dependency_graphs::simulateReload(
hadCompilationError);
if (!changedNodes)
return g.getAllJobs();
return g.findJobsToRecompileWhenNodesChange(changedNodes.getValue());
return g.findJobsToRecompileWhenNodesChange(changedNodes.value());
}

LLVM_ATTRIBUTE_UNUSED
Expand Down
8 changes: 4 additions & 4 deletions unittests/Driver/UnitTestSourceFileDepGraphFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void UnitTestSourceFileDepGraphFactory::addADefinedDecl(StringRef s,
const Optional<Fingerprint> fingerprint =
swift::mockFingerprintFromString(fingerprintString);

AbstractSourceFileDepGraphFactory::addADefinedDecl(key.getValue(),
AbstractSourceFileDepGraphFactory::addADefinedDecl(key.value(),
fingerprint);
}

Expand All @@ -80,7 +80,7 @@ UnitTestSourceFileDepGraphFactory::computeUseKey(StringRef s,
isCascadingUse ? DeclAspect::interface : DeclAspect::implementation;

if (!s.empty())
return parseADefinedDecl(s, kindOfUse, aspectOfUse).getValue();
return parseADefinedDecl(s, kindOfUse, aspectOfUse).value();
StringRef swiftDepsRef(swiftDeps);
return DependencyKey::Builder(NodeKind::sourceFileProvide, aspectOfUse)
.withName(swiftDepsRef)
Expand Down Expand Up @@ -155,15 +155,15 @@ UnitTestSourceFileDepGraphFactory::parseContext(const StringRef s,
const NodeKind kind) {
return !singleNameIsContext(kind)
? s.split(nameContextSeparator).first.str()
: singleNameIsContext(kind).getValue() ? s.str() : "";
: singleNameIsContext(kind).value() ? s.str() : "";
}

std::string UnitTestSourceFileDepGraphFactory::parseName(const StringRef s,
const NodeKind kind) {
const std::string name =
!singleNameIsContext(kind)
? s.split(nameContextSeparator).second.str()
: singleNameIsContext(kind).getValue() ? "" : s.str();
: singleNameIsContext(kind).value() ? "" : s.str();
assert(kind != NodeKind::member ||
!name.empty() && "Should be a potentialMember");
return name;
Expand Down
56 changes: 28 additions & 28 deletions unittests/Parse/BuildConfigTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@ Optional<version::Version> V(const char *VersionString) {

TEST_F(CompilerVersionTest, VersionComparison) {
auto currentVersion = version::getCurrentCompilerVersion();
EXPECT_GE(CV("700").getValue(), CV("602").getValue());
EXPECT_GE(CV("700.*").getValue(), CV("700.*").getValue());
EXPECT_GE(CV("700.*.1").getValue(), CV("700.*.0").getValue());
EXPECT_GE(CV("700.*.23").getValue(), CV("700.*.21").getValue());
EXPECT_GE(CV("700.*.1.1.0").getValue(), CV("700.*.1.1").getValue());
EXPECT_GE(CV("700").value(), CV("602").value());
EXPECT_GE(CV("700.*").value(), CV("700.*").value());
EXPECT_GE(CV("700.*.1").value(), CV("700.*.0").value());
EXPECT_GE(CV("700.*.23").value(), CV("700.*.21").value());
EXPECT_GE(CV("700.*.1.1.0").value(), CV("700.*.1.1").value());
EXPECT_GE(currentVersion, currentVersion);
EXPECT_GE(currentVersion, CV("9223371.*.999.999.999").getValue());
EXPECT_GE(currentVersion, CV("9223371.*.999.999.999").value());
}

TEST_F(VersionTest, VersionComparison) {
auto currentVersion = version::Version::getCurrentLanguageVersion();
EXPECT_GE(V("3").getValue(), V("2").getValue());
EXPECT_GE(V("2.0").getValue(), V("2.0").getValue());
EXPECT_GE(V("2.1").getValue(), V("2.0").getValue());
EXPECT_GE(V("3.1").getValue(), V("3.0.1").getValue());
EXPECT_GE(V("2.0").getValue(), V("2").getValue());
EXPECT_GE(V("3").value(), V("2").value());
EXPECT_GE(V("2.0").value(), V("2.0").value());
EXPECT_GE(V("2.1").value(), V("2.0").value());
EXPECT_GE(V("3.1").value(), V("3.0.1").value());
EXPECT_GE(V("2.0").value(), V("2").value());
EXPECT_GE(currentVersion, currentVersion);
EXPECT_GE(currentVersion, V("1.0").getValue());
EXPECT_GE(currentVersion, V("2").getValue());
EXPECT_GE(currentVersion, V("1.0").value());
EXPECT_GE(currentVersion, V("2").value());
EXPECT_FALSE(V("2.n").hasValue());
EXPECT_FALSE(V("").hasValue());
EXPECT_FALSE(V("\"2.0\"").hasValue());
Expand All @@ -53,23 +53,23 @@ TEST_F(VersionTest, VersionComparison) {
}

TEST_F(CompilerVersionUnpackingTest, VersionComparison) {
EXPECT_EQ(CV("700").getValue(), V("0.700").getValue());
EXPECT_EQ(CV("700.*").getValue(), V("0.700").getValue());
EXPECT_EQ(CV("700.*.1").getValue(), V("0.700.1").getValue());
EXPECT_EQ(CV("700.*.23").getValue(), V("0.700.23").getValue());
EXPECT_EQ(CV("700.*.1.1").getValue(), V("0.700.1.1").getValue());
EXPECT_EQ(CV("700").value(), V("0.700").value());
EXPECT_EQ(CV("700.*").value(), V("0.700").value());
EXPECT_EQ(CV("700.*.1").value(), V("0.700.1").value());
EXPECT_EQ(CV("700.*.23").value(), V("0.700.23").value());
EXPECT_EQ(CV("700.*.1.1").value(), V("0.700.1.1").value());

EXPECT_EQ(CV("1300").getValue(), V("1.300").getValue());
EXPECT_EQ(CV("1300.*").getValue(), V("1.300").getValue());
EXPECT_EQ(CV("1300.*.1").getValue(), V("1.300.1").getValue());
EXPECT_EQ(CV("1300.*.23").getValue(), V("1.300.23").getValue());
EXPECT_EQ(CV("1300.*.1.1").getValue(), V("1.300.1.1").getValue());
EXPECT_EQ(CV("1300").value(), V("1.300").value());
EXPECT_EQ(CV("1300.*").value(), V("1.300").value());
EXPECT_EQ(CV("1300.*.1").value(), V("1.300.1").value());
EXPECT_EQ(CV("1300.*.23").value(), V("1.300.23").value());
EXPECT_EQ(CV("1300.*.1.1").value(), V("1.300.1.1").value());

EXPECT_EQ(CV("5007").getValue(), V("5.7").getValue());
EXPECT_EQ(CV("5007.*").getValue(), V("5.7").getValue());
EXPECT_EQ(CV("5007.*.1").getValue(), V("5.7.1").getValue());
EXPECT_EQ(CV("5007.*.23").getValue(), V("5.7.23").getValue());
EXPECT_EQ(CV("5007.*.1.1").getValue(), V("5.7.1.1").getValue());
EXPECT_EQ(CV("5007").value(), V("5.7").value());
EXPECT_EQ(CV("5007.*").value(), V("5.7").value());
EXPECT_EQ(CV("5007.*.1").value(), V("5.7.1").value());
EXPECT_EQ(CV("5007.*.23").value(), V("5.7.23").value());
EXPECT_EQ(CV("5007.*.1.1").value(), V("5.7.1.1").value());

// Since this test was added during 5.7, we expect all of these comparisons to
// be GE, either because we are comparing to the empty version or because we
Expand Down
2 changes: 1 addition & 1 deletion unittests/Sema/BindingInferenceTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ TEST_F(SemaTest, TestNoDoubleVoidClosureResultInference) {
llvm::SmallPtrSet<Type, 2> inferredTypes;

while (auto binding = producer()) {
ASSERT_TRUE(binding.hasValue());
ASSERT_TRUE(binding.has_value());
ASSERT_EQ(binding->getTypeVariable(), typeVar);
ASSERT_TRUE(inferredTypes.insert(binding->getType()).second);
}
Expand Down
4 changes: 2 additions & 2 deletions unittests/Sema/PlaceholderTypeInferenceTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ TEST_F(SemaTest, TestPlaceholderInferenceForArrayLiteral) {
auto &solution = solutions[0];

auto eltTy = ConstraintSystem::isArrayType(solution.simplifyType(solution.getType(arrayExpr)));
ASSERT_TRUE(eltTy.hasValue());
ASSERT_TRUE(eltTy.has_value());
ASSERT_TRUE((*eltTy)->is<StructType>());
ASSERT_EQ((*eltTy)->getAs<StructType>()->getDecl(), intTypeDecl);
}
Expand Down Expand Up @@ -89,7 +89,7 @@ TEST_F(SemaTest, TestPlaceholderInferenceForDictionaryLiteral) {
auto &solution = solutions[0];

auto keyValTys = ConstraintSystem::isDictionaryType(solution.simplifyType(solution.getType(dictExpr)));
ASSERT_TRUE(keyValTys.hasValue());
ASSERT_TRUE(keyValTys.has_value());

Type keyTy;
Type valTy;
Expand Down
10 changes: 5 additions & 5 deletions unittests/Sema/SolutionFilteringTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ TEST_F(SemaTest, TestFilteringBasedOnSolutionScore) {

auto best = CS.findBestSolution(solutions, /*minimize=*/true);

ASSERT_FALSE(best.hasValue());
ASSERT_FALSE(best.has_value());
ASSERT_EQ(solutions.size(), 2u);
ASSERT_EQ(solutions[0].getFixedScore(), bestScore);
ASSERT_EQ(solutions[1].getFixedScore(), bestScore);
Expand All @@ -73,7 +73,7 @@ TEST_F(SemaTest, TestFilteringBasedOnSolutionScore) {

auto best = CS.findBestSolution(solutions, /*minimize=*/true);

ASSERT_FALSE(best.hasValue());
ASSERT_FALSE(best.has_value());
ASSERT_EQ(solutions.size(), 2u);
ASSERT_EQ(solutions[0].getFixedScore(), bestScore);
ASSERT_EQ(solutions[1].getFixedScore(), bestScore);
Expand All @@ -92,7 +92,7 @@ TEST_F(SemaTest, TestFilteringBasedOnSolutionScore) {

auto best = CS.findBestSolution(solutions, /*minimize=*/true);

ASSERT_FALSE(best.hasValue());
ASSERT_FALSE(best.has_value());
ASSERT_EQ(solutions.size(), 2u);
ASSERT_EQ(solutions[0].getFixedScore(), bestScore);
ASSERT_EQ(solutions[1].getFixedScore(), bestScore);
Expand All @@ -110,7 +110,7 @@ TEST_F(SemaTest, TestFilteringBasedOnSolutionScore) {

auto best = CS.findBestSolution(solutions, /*minimize=*/true);

ASSERT_FALSE(best.hasValue());
ASSERT_FALSE(best.has_value());
ASSERT_EQ(solutions.size(), 2u);
ASSERT_EQ(solutions[0].getFixedScore(), bestScore);
ASSERT_EQ(solutions[1].getFixedScore(), bestScore);
Expand All @@ -130,7 +130,7 @@ TEST_F(SemaTest, TestFilteringBasedOnSolutionScore) {

auto best = CS.findBestSolution(solutions, /*minimize=*/true);

ASSERT_FALSE(best.hasValue());
ASSERT_FALSE(best.has_value());
ASSERT_EQ(solutions.size(), 2u);
ASSERT_EQ(solutions[0].getFixedScore(), bestScore);
ASSERT_EQ(solutions[1].getFixedScore(), bestScore);
Expand Down
4 changes: 2 additions & 2 deletions unittests/SourceKit/SwiftLang/CursorInfoTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ class CursorInfoTest : public ::testing::Test {

void open(const char *DocName, StringRef Text,
Optional<ArrayRef<const char *>> CArgs = llvm::None) {
auto Args = CArgs.hasValue() ? makeArgs(DocName, *CArgs)
: std::vector<const char *>{};
auto Args = CArgs.has_value() ? makeArgs(DocName, *CArgs)
: std::vector<const char *>{};
auto Buf = MemoryBuffer::getMemBufferCopy(Text, DocName);
getLang().editorOpen(DocName, Buf.get(), Consumer, Args, None);
}
Expand Down