Skip to content

Commit b6a01ca

Browse files
kazutakahiratakazutakahirata
committed
[llvm/unittests] 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
1 parent b253628 commit b6a01ca

File tree

75 files changed

+588
-535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+588
-535
lines changed

‎llvm/include/llvm/Testing/Support/Error.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ MATCHER(Failed, "") { return !arg.Success(); }
196196

197197
template <typename InfoT>
198198
testing::Matcher<const detail::ErrorHolder &> Failed() {
199-
return MakeMatcher(new detail::ErrorMatchesMono<InfoT>(None));
199+
return MakeMatcher(new detail::ErrorMatchesMono<InfoT>(std::nullopt));
200200
}
201201

202202
template <typename InfoT, typename M>

‎llvm/lib/Testing/Support/Annotations.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ Annotations::Annotations(llvm::StringRef Text) {
3737
All.push_back(
3838
{Code.size(), size_t(-1), Name.value_or(""), Payload.value_or("")});
3939
Points[Name.value_or("")].push_back(All.size() - 1);
40-
Name = llvm::None;
41-
Payload = llvm::None;
40+
Name = std::nullopt;
41+
Payload = std::nullopt;
4242
continue;
4343
}
4444
if (Text.consume_front("[[")) {
4545
OpenRanges.push_back(
4646
{Code.size(), size_t(-1), Name.value_or(""), Payload.value_or("")});
47-
Name = llvm::None;
48-
Payload = llvm::None;
47+
Name = std::nullopt;
48+
Payload = std::nullopt;
4949
continue;
5050
}
5151
Require(!Name, "$name should be followed by ^ or [[");

‎llvm/unittests/ADT/APIntTest.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2932,10 +2932,10 @@ TEST(APIntTest, MultiplicativeInverseExaustive) {
29322932

29332933
TEST(APIntTest, GetMostSignificantDifferentBit) {
29342934
EXPECT_EQ(APIntOps::GetMostSignificantDifferentBit(APInt(8, 0), APInt(8, 0)),
2935-
llvm::None);
2935+
std::nullopt);
29362936
EXPECT_EQ(
29372937
APIntOps::GetMostSignificantDifferentBit(APInt(8, 42), APInt(8, 42)),
2938-
llvm::None);
2938+
std::nullopt);
29392939
EXPECT_EQ(*APIntOps::GetMostSignificantDifferentBit(APInt(8, 0), APInt(8, 1)),
29402940
0u);
29412941
EXPECT_EQ(*APIntOps::GetMostSignificantDifferentBit(APInt(8, 0), APInt(8, 2)),
@@ -2945,7 +2945,7 @@ TEST(APIntTest, GetMostSignificantDifferentBit) {
29452945
EXPECT_EQ(*APIntOps::GetMostSignificantDifferentBit(APInt(8, 1), APInt(8, 0)),
29462946
0u);
29472947
EXPECT_EQ(APIntOps::GetMostSignificantDifferentBit(APInt(8, 1), APInt(8, 1)),
2948-
llvm::None);
2948+
std::nullopt);
29492949
EXPECT_EQ(*APIntOps::GetMostSignificantDifferentBit(APInt(8, 1), APInt(8, 2)),
29502950
1u);
29512951
EXPECT_EQ(*APIntOps::GetMostSignificantDifferentBit(APInt(8, 1), APInt(8, 3)),
@@ -2960,7 +2960,7 @@ TEST(APIntTest, GetMostSignificantDifferentBitExaustive) {
29602960
[](const APInt &V0, const APInt &V1) -> llvm::Optional<unsigned> {
29612961
assert(V0.getBitWidth() == V1.getBitWidth() && "Must have same bitwidth");
29622962
if (V0 == V1)
2963-
return llvm::None; // Bitwise identical.
2963+
return std::nullopt; // Bitwise identical.
29642964
// There is a mismatch. Let's find the most significant different bit.
29652965
for (int Bit = V0.getBitWidth() - 1; Bit >= 0; --Bit) {
29662966
if (V0[Bit] == V1[Bit])

‎llvm/unittests/ADT/IteratorTest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ TEST(ZipIteratorTest, ZipLongestBasic) {
481481
const vector<tuple<Optional<unsigned>, Optional<StringRef>>> expected{
482482
make_tuple(3, StringRef("2")), make_tuple(1, StringRef("7")),
483483
make_tuple(4, StringRef("1")), make_tuple(1, StringRef("8")),
484-
make_tuple(5, None), make_tuple(9, None)};
484+
make_tuple(5, std::nullopt), make_tuple(9, std::nullopt)};
485485
size_t iters = 0;
486486
for (auto tup : zip_longest(pi, e)) {
487487
EXPECT_EQ(tup, expected[iters]);
@@ -495,7 +495,7 @@ TEST(ZipIteratorTest, ZipLongestBasic) {
495495
const vector<tuple<Optional<StringRef>, Optional<unsigned>>> expected{
496496
make_tuple(StringRef("2"), 3), make_tuple(StringRef("7"), 1),
497497
make_tuple(StringRef("1"), 4), make_tuple(StringRef("8"), 1),
498-
make_tuple(None, 5), make_tuple(None, 9)};
498+
make_tuple(std::nullopt, 5), make_tuple(std::nullopt, 9)};
499499
size_t iters = 0;
500500
for (auto tup : zip_longest(e, pi)) {
501501
EXPECT_EQ(tup, expected[iters]);

‎llvm/unittests/ADT/OptionalTest.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -680,12 +680,12 @@ void CheckRelation(const Optional<T> &Lhs, const Optional<T> &Rhs,
680680
if (Lhs)
681681
EXPECT_EQ(Expected, OperatorT::apply(*Lhs, Rhs));
682682
else
683-
EXPECT_EQ(Expected, OperatorT::apply(None, Rhs));
683+
EXPECT_EQ(Expected, OperatorT::apply(std::nullopt, Rhs));
684684

685685
if (Rhs)
686686
EXPECT_EQ(Expected, OperatorT::apply(Lhs, *Rhs));
687687
else
688-
EXPECT_EQ(Expected, OperatorT::apply(Lhs, None));
688+
EXPECT_EQ(Expected, OperatorT::apply(Lhs, std::nullopt));
689689
}
690690

691691
struct EqualityMock {};
@@ -800,7 +800,7 @@ TEST(OptionalTest, StreamOperator) {
800800
};
801801
EXPECT_EQ("ComparableAndStreamable",
802802
to_string(ComparableAndStreamable::get()));
803-
EXPECT_EQ("None", to_string(None));
803+
EXPECT_EQ("None", to_string(std::nullopt));
804804
}
805805

806806
struct Comparable {

‎llvm/unittests/Analysis/AliasAnalysisTest.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,17 +192,17 @@ TEST_F(AliasAnalysisTest, getModRefInfo) {
192192

193193
// Check basic results
194194
EXPECT_EQ(AA.getModRefInfo(Store1, MemoryLocation()), ModRefInfo::Mod);
195-
EXPECT_EQ(AA.getModRefInfo(Store1, None), ModRefInfo::Mod);
195+
EXPECT_EQ(AA.getModRefInfo(Store1, std::nullopt), ModRefInfo::Mod);
196196
EXPECT_EQ(AA.getModRefInfo(Load1, MemoryLocation()), ModRefInfo::Ref);
197-
EXPECT_EQ(AA.getModRefInfo(Load1, None), ModRefInfo::Ref);
197+
EXPECT_EQ(AA.getModRefInfo(Load1, std::nullopt), ModRefInfo::Ref);
198198
EXPECT_EQ(AA.getModRefInfo(Add1, MemoryLocation()), ModRefInfo::NoModRef);
199-
EXPECT_EQ(AA.getModRefInfo(Add1, None), ModRefInfo::NoModRef);
199+
EXPECT_EQ(AA.getModRefInfo(Add1, std::nullopt), ModRefInfo::NoModRef);
200200
EXPECT_EQ(AA.getModRefInfo(VAArg1, MemoryLocation()), ModRefInfo::ModRef);
201-
EXPECT_EQ(AA.getModRefInfo(VAArg1, None), ModRefInfo::ModRef);
201+
EXPECT_EQ(AA.getModRefInfo(VAArg1, std::nullopt), ModRefInfo::ModRef);
202202
EXPECT_EQ(AA.getModRefInfo(CmpXChg1, MemoryLocation()), ModRefInfo::ModRef);
203-
EXPECT_EQ(AA.getModRefInfo(CmpXChg1, None), ModRefInfo::ModRef);
203+
EXPECT_EQ(AA.getModRefInfo(CmpXChg1, std::nullopt), ModRefInfo::ModRef);
204204
EXPECT_EQ(AA.getModRefInfo(AtomicRMW, MemoryLocation()), ModRefInfo::ModRef);
205-
EXPECT_EQ(AA.getModRefInfo(AtomicRMW, None), ModRefInfo::ModRef);
205+
EXPECT_EQ(AA.getModRefInfo(AtomicRMW, std::nullopt), ModRefInfo::ModRef);
206206
}
207207

208208
static Instruction *getInstructionByName(Function &F, StringRef Name) {

‎llvm/unittests/Analysis/LoopInfoTest.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ TEST(LoopInfoTest, CanonicalLoop) {
271271
EXPECT_NE(L, nullptr);
272272

273273
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
274-
EXPECT_NE(Bounds, None);
274+
EXPECT_NE(Bounds, std::nullopt);
275275
ConstantInt *InitialIVValue =
276276
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
277277
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -330,7 +330,7 @@ TEST(LoopInfoTest, LoopWithInverseGuardSuccs) {
330330
EXPECT_NE(L, nullptr);
331331

332332
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
333-
EXPECT_NE(Bounds, None);
333+
EXPECT_NE(Bounds, std::nullopt);
334334
ConstantInt *InitialIVValue =
335335
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
336336
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -389,7 +389,7 @@ TEST(LoopInfoTest, LoopWithSwappedGuardCmp) {
389389
EXPECT_NE(L, nullptr);
390390

391391
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
392-
EXPECT_NE(Bounds, None);
392+
EXPECT_NE(Bounds, std::nullopt);
393393
ConstantInt *InitialIVValue =
394394
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
395395
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -448,7 +448,7 @@ TEST(LoopInfoTest, LoopWithInverseLatchSuccs) {
448448
EXPECT_NE(L, nullptr);
449449

450450
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
451-
EXPECT_NE(Bounds, None);
451+
EXPECT_NE(Bounds, std::nullopt);
452452
ConstantInt *InitialIVValue =
453453
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
454454
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -507,7 +507,7 @@ TEST(LoopInfoTest, LoopWithLatchCmpNE) {
507507
EXPECT_NE(L, nullptr);
508508

509509
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
510-
EXPECT_NE(Bounds, None);
510+
EXPECT_NE(Bounds, std::nullopt);
511511
ConstantInt *InitialIVValue =
512512
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
513513
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -567,7 +567,7 @@ TEST(LoopInfoTest, LoopWithGuardCmpSLE) {
567567
EXPECT_NE(L, nullptr);
568568

569569
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
570-
EXPECT_NE(Bounds, None);
570+
EXPECT_NE(Bounds, std::nullopt);
571571
ConstantInt *InitialIVValue =
572572
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
573573
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -626,7 +626,7 @@ TEST(LoopInfoTest, LoopNonConstantStep) {
626626
EXPECT_NE(L, nullptr);
627627

628628
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
629-
EXPECT_NE(Bounds, None);
629+
EXPECT_NE(Bounds, std::nullopt);
630630
ConstantInt *InitialIVValue =
631631
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
632632
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -682,7 +682,7 @@ TEST(LoopInfoTest, LoopUnsignedBounds) {
682682
EXPECT_NE(L, nullptr);
683683

684684
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
685-
EXPECT_NE(Bounds, None);
685+
EXPECT_NE(Bounds, std::nullopt);
686686
ConstantInt *InitialIVValue =
687687
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
688688
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -741,7 +741,7 @@ TEST(LoopInfoTest, DecreasingLoop) {
741741
EXPECT_NE(L, nullptr);
742742

743743
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
744-
EXPECT_NE(Bounds, None);
744+
EXPECT_NE(Bounds, std::nullopt);
745745
EXPECT_EQ(Bounds->getInitialIVValue().getName(), "ub");
746746
EXPECT_EQ(Bounds->getStepInst().getName(), "inc");
747747
ConstantInt *StepValue =
@@ -801,7 +801,7 @@ TEST(LoopInfoTest, CannotFindDirection) {
801801
EXPECT_NE(L, nullptr);
802802

803803
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
804-
EXPECT_NE(Bounds, None);
804+
EXPECT_NE(Bounds, std::nullopt);
805805
ConstantInt *InitialIVValue =
806806
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
807807
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -861,7 +861,7 @@ TEST(LoopInfoTest, ZextIndVar) {
861861
EXPECT_NE(L, nullptr);
862862

863863
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
864-
EXPECT_NE(Bounds, None);
864+
EXPECT_NE(Bounds, std::nullopt);
865865
ConstantInt *InitialIVValue =
866866
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
867867
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -922,7 +922,7 @@ TEST(LoopInfoTest, MultiExitingLoop) {
922922
EXPECT_NE(L, nullptr);
923923

924924
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
925-
EXPECT_NE(Bounds, None);
925+
EXPECT_NE(Bounds, std::nullopt);
926926
ConstantInt *InitialIVValue =
927927
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
928928
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -982,7 +982,7 @@ TEST(LoopInfoTest, MultiExitLoop) {
982982
EXPECT_NE(L, nullptr);
983983

984984
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
985-
EXPECT_NE(Bounds, None);
985+
EXPECT_NE(Bounds, std::nullopt);
986986
ConstantInt *InitialIVValue =
987987
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
988988
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -1034,7 +1034,7 @@ TEST(LoopInfoTest, UnguardedLoop) {
10341034
EXPECT_NE(L, nullptr);
10351035

10361036
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
1037-
EXPECT_NE(Bounds, None);
1037+
EXPECT_NE(Bounds, std::nullopt);
10381038
ConstantInt *InitialIVValue =
10391039
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
10401040
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -1092,7 +1092,7 @@ TEST(LoopInfoTest, UnguardedLoopWithControlFlow) {
10921092
EXPECT_NE(L, nullptr);
10931093

10941094
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
1095-
EXPECT_NE(Bounds, None);
1095+
EXPECT_NE(Bounds, std::nullopt);
10961096
ConstantInt *InitialIVValue =
10971097
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
10981098
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -1163,7 +1163,7 @@ TEST(LoopInfoTest, LoopNest) {
11631163
EXPECT_NE(L, nullptr);
11641164

11651165
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
1166-
EXPECT_NE(Bounds, None);
1166+
EXPECT_NE(Bounds, std::nullopt);
11671167
ConstantInt *InitialIVValue =
11681168
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
11691169
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -1189,7 +1189,7 @@ TEST(LoopInfoTest, LoopNest) {
11891189
EXPECT_NE(L, nullptr);
11901190

11911191
Optional<Loop::LoopBounds> InnerBounds = L->getBounds(SE);
1192-
EXPECT_NE(InnerBounds, None);
1192+
EXPECT_NE(InnerBounds, std::nullopt);
11931193
InitialIVValue =
11941194
dyn_cast<ConstantInt>(&InnerBounds->getInitialIVValue());
11951195
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());
@@ -1256,7 +1256,7 @@ TEST(LoopInfoTest, AuxiliaryIV) {
12561256
EXPECT_NE(L, nullptr);
12571257

12581258
Optional<Loop::LoopBounds> Bounds = L->getBounds(SE);
1259-
EXPECT_NE(Bounds, None);
1259+
EXPECT_NE(Bounds, std::nullopt);
12601260
ConstantInt *InitialIVValue =
12611261
dyn_cast<ConstantInt>(&Bounds->getInitialIVValue());
12621262
EXPECT_TRUE(InitialIVValue && InitialIVValue->isZero());

‎llvm/unittests/Analysis/MemoryBuiltinsTest.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ TEST(AllocSize, AllocationBuiltinsTest) {
2929
FunctionType::get(Type::getInt8PtrTy(Context), {ArgTy}, false),
3030
GlobalValue::ExternalLinkage, "F", &M);
3131

32-
AllocSizeFn->addFnAttr(Attribute::getWithAllocSizeArgs(Context, 1, None));
32+
AllocSizeFn->addFnAttr(
33+
Attribute::getWithAllocSizeArgs(Context, 1, std::nullopt));
3334

3435
// 100 is arbitrary.
3536
std::unique_ptr<CallInst> Caller(

‎llvm/unittests/Analysis/ScalarEvolutionTest.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ TEST_F(ScalarEvolutionsTest, SCEVComputeConstantDifference) {
11511151
auto diff = [&SE](const SCEV *LHS, const SCEV *RHS) -> Optional<int> {
11521152
auto ConstantDiffOrNone = computeConstantDifference(SE, LHS, RHS);
11531153
if (!ConstantDiffOrNone)
1154-
return None;
1154+
return std::nullopt;
11551155

11561156
auto ExtDiff = ConstantDiffOrNone->getSExtValue();
11571157
int Diff = ExtDiff;
@@ -1170,9 +1170,9 @@ TEST_F(ScalarEvolutionsTest, SCEVComputeConstantDifference) {
11701170
EXPECT_EQ(diff(ScevIV, ScevIVNext), -1);
11711171
EXPECT_EQ(diff(ScevIVNext, ScevIV), 1);
11721172
EXPECT_EQ(diff(ScevIVNext, ScevIVNext), 0);
1173-
EXPECT_EQ(diff(ScevV0, ScevIV), None);
1174-
EXPECT_EQ(diff(ScevIVNext, ScevV3), None);
1175-
EXPECT_EQ(diff(ScevYY, ScevV3), None);
1173+
EXPECT_EQ(diff(ScevV0, ScevIV), std::nullopt);
1174+
EXPECT_EQ(diff(ScevIVNext, ScevV3), std::nullopt);
1175+
EXPECT_EQ(diff(ScevYY, ScevV3), std::nullopt);
11761176
});
11771177
}
11781178

‎llvm/unittests/Analysis/ValueTrackingTest.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,7 +1323,7 @@ TEST_F(ValueTrackingTest, IsImpliedConditionAnd) {
13231323
const DataLayout &DL = M->getDataLayout();
13241324
EXPECT_EQ(isImpliedCondition(A, A2, DL), true);
13251325
EXPECT_EQ(isImpliedCondition(A, A3, DL), false);
1326-
EXPECT_EQ(isImpliedCondition(A, A4, DL), None);
1326+
EXPECT_EQ(isImpliedCondition(A, A4, DL), std::nullopt);
13271327
}
13281328

13291329
TEST_F(ValueTrackingTest, IsImpliedConditionAnd2) {
@@ -1342,7 +1342,7 @@ TEST_F(ValueTrackingTest, IsImpliedConditionAnd2) {
13421342
const DataLayout &DL = M->getDataLayout();
13431343
EXPECT_EQ(isImpliedCondition(A, A2, DL), true);
13441344
EXPECT_EQ(isImpliedCondition(A, A3, DL), false);
1345-
EXPECT_EQ(isImpliedCondition(A, A4, DL), None);
1345+
EXPECT_EQ(isImpliedCondition(A, A4, DL), std::nullopt);
13461346
}
13471347

13481348
TEST_F(ValueTrackingTest, IsImpliedConditionAndVec) {
@@ -1373,7 +1373,7 @@ TEST_F(ValueTrackingTest, IsImpliedConditionOr) {
13731373
const DataLayout &DL = M->getDataLayout();
13741374
EXPECT_EQ(isImpliedCondition(A, A2, DL, false), false);
13751375
EXPECT_EQ(isImpliedCondition(A, A3, DL, false), true);
1376-
EXPECT_EQ(isImpliedCondition(A, A4, DL, false), None);
1376+
EXPECT_EQ(isImpliedCondition(A, A4, DL, false), std::nullopt);
13771377
}
13781378

13791379
TEST_F(ValueTrackingTest, IsImpliedConditionOr2) {
@@ -1392,7 +1392,7 @@ TEST_F(ValueTrackingTest, IsImpliedConditionOr2) {
13921392
const DataLayout &DL = M->getDataLayout();
13931393
EXPECT_EQ(isImpliedCondition(A, A2, DL, false), false);
13941394
EXPECT_EQ(isImpliedCondition(A, A3, DL, false), true);
1395-
EXPECT_EQ(isImpliedCondition(A, A4, DL, false), None);
1395+
EXPECT_EQ(isImpliedCondition(A, A4, DL, false), std::nullopt);
13961396
}
13971397

13981398
TEST_F(ComputeKnownBitsTest, KnownNonZeroShift) {

0 commit comments

Comments
 (0)