[llvm] 4531b61 - [GlobalISel] Use std::optional in CombinerHelper.cpp (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Sat Nov 26 14:33:51 PST 2022
Author: Kazu Hirata
Date: 2022-11-26T14:33:45-08:00
New Revision: 4531b61208eb723bdd9533236e14b349ee0ca22d
URL: https://github.com/llvm/llvm-project/commit/4531b61208eb723bdd9533236e14b349ee0ca22d
DIFF: https://github.com/llvm/llvm-project/commit/4531b61208eb723bdd9533236e14b349ee0ca22d.diff
LOG: [GlobalISel] Use std::optional in CombinerHelper.cpp (NFC)
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
Added:
Modified:
llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
Removed:
################################################################################
diff --git a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
index 297e009b5da45..614ab7033235f 100644
--- a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
@@ -33,6 +33,7 @@
#include "llvm/Support/MathExtras.h"
#include "llvm/Target/TargetMachine.h"
#include <cmath>
+#include <optional>
#include <tuple>
#define DEBUG_TYPE "gi-combiner"
@@ -3274,7 +3275,7 @@ CombinerHelper::findCandidatesForLoadOrCombine(const MachineInstr *Root) const {
/// e.g. x[i] << 24
///
/// \returns The load instruction and the byte offset it is moved into.
-static Optional<std::pair<GZExtLoad *, int64_t>>
+static std::optional<std::pair<GZExtLoad *, int64_t>>
matchLoadAndBytePosition(Register Reg, unsigned MemSizeInBits,
const MachineRegisterInfo &MRI) {
assert(MRI.hasOneNonDBGUse(Reg) &&
@@ -3554,8 +3555,9 @@ bool CombinerHelper::matchLoadOrCombine(
/// value found.
/// On match, returns the start byte offset of the \p SrcVal that is being
/// stored.
-static Optional<int64_t> getTruncStoreByteOffset(GStore &Store, Register &SrcVal,
- MachineRegisterInfo &MRI) {
+static std::optional<int64_t>
+getTruncStoreByteOffset(GStore &Store, Register &SrcVal,
+ MachineRegisterInfo &MRI) {
Register TruncVal;
if (!mi_match(Store.getValueReg(), MRI, m_GTrunc(m_Reg(TruncVal))))
return None;
More information about the llvm-commits
mailing list