diff options
author | Fangrui Song <i@maskray.me> | 2022-12-16 08:49:10 +0000 |
---|---|---|
committer | Fangrui Song <i@maskray.me> | 2022-12-16 08:49:10 +0000 |
commit | b1df3a2c0b6a42570042934cb79ca0e4359f863b (patch) | |
tree | 2cededee6eea9ccc6a38a25ea468edd352253f43 /llvm/lib/CodeGen | |
parent | 61a124db5647f83422476797a761d2ec22a2d17f (diff) | |
download | llvm-b1df3a2c0b6a42570042934cb79ca0e4359f863b.zip llvm-b1df3a2c0b6a42570042934cb79ca0e4359f863b.tar.gz llvm-b1df3a2c0b6a42570042934cb79ca0e4359f863b.tar.bz2 |
[Support] llvm::Optional => std::optional
https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716
Diffstat (limited to 'llvm/lib/CodeGen')
-rw-r--r-- | llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp | 2 | ||||
-rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp index c5d5d68..5ff3dd2 100644 --- a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp +++ b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp @@ -4216,7 +4216,7 @@ bool CombinerHelper::matchICmpToTrueFalseKnownBits(MachineInstr &MI, auto Pred = static_cast<CmpInst::Predicate>(MI.getOperand(1).getPredicate()); auto KnownLHS = KB->getKnownBits(MI.getOperand(2).getReg()); auto KnownRHS = KB->getKnownBits(MI.getOperand(3).getReg()); - Optional<bool> KnownVal; + std::optional<bool> KnownVal; switch (Pred) { default: llvm_unreachable("Unexpected G_ICMP predicate?"); diff --git a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp index a0e7705..a7716e8 100644 --- a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp @@ -2103,9 +2103,9 @@ bool TargetLowering::SimplifyDemandedBits( KnownBits Known0 = TLO.DAG.computeKnownBits(Op0, DemandedElts, Depth + 1); KnownBits Known1 = TLO.DAG.computeKnownBits(Op1, DemandedElts, Depth + 1); Known = KnownBits::umin(Known0, Known1); - if (Optional<bool> IsULE = KnownBits::ule(Known0, Known1)) + if (std::optional<bool> IsULE = KnownBits::ule(Known0, Known1)) return TLO.CombineTo(Op, IsULE.value() ? Op0 : Op1); - if (Optional<bool> IsULT = KnownBits::ult(Known0, Known1)) + if (std::optional<bool> IsULT = KnownBits::ult(Known0, Known1)) return TLO.CombineTo(Op, IsULT.value() ? Op0 : Op1); break; } @@ -2116,9 +2116,9 @@ bool TargetLowering::SimplifyDemandedBits( KnownBits Known0 = TLO.DAG.computeKnownBits(Op0, DemandedElts, Depth + 1); KnownBits Known1 = TLO.DAG.computeKnownBits(Op1, DemandedElts, Depth + 1); Known = KnownBits::umax(Known0, Known1); - if (Optional<bool> IsUGE = KnownBits::uge(Known0, Known1)) + if (std::optional<bool> IsUGE = KnownBits::uge(Known0, Known1)) return TLO.CombineTo(Op, IsUGE.value() ? Op0 : Op1); - if (Optional<bool> IsUGT = KnownBits::ugt(Known0, Known1)) + if (std::optional<bool> IsUGT = KnownBits::ugt(Known0, Known1)) return TLO.CombineTo(Op, IsUGT.value() ? Op0 : Op1); break; } |