[llvm] 1ca0cb7 - [llvm] Replace None with std::nullopt in comments (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Tue Apr 25 23:53:44 PDT 2023
Author: Kazu Hirata
Date: 2023-04-25T23:53:32-07:00
New Revision: 1ca0cb717a0950f8397660d142f14a9b28deaebe
URL: https://github.com/llvm/llvm-project/commit/1ca0cb717a0950f8397660d142f14a9b28deaebe
DIFF: https://github.com/llvm/llvm-project/commit/1ca0cb717a0950f8397660d142f14a9b28deaebe.diff
LOG: [llvm] Replace None with std::nullopt in comments (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/include/llvm/Analysis/IRSimilarityIdentifier.h
llvm/include/llvm/Analysis/LoopInfo.h
llvm/include/llvm/CodeGen/MIRFormatter.h
llvm/include/llvm/CodeGen/TargetInstrInfo.h
llvm/include/llvm/Object/MachO.h
llvm/include/llvm/Support/CachePruning.h
llvm/include/llvm/Support/Format.h
llvm/lib/Analysis/LazyValueInfo.cpp
llvm/lib/CodeGen/ImplicitNullChecks.cpp
llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.h
llvm/lib/FileCheck/FileCheckImpl.h
llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
llvm/lib/Target/RISCV/RISCVISelLowering.cpp
llvm/lib/Transforms/IPO/AttributorAttributes.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/Analysis/IRSimilarityIdentifier.h b/llvm/include/llvm/Analysis/IRSimilarityIdentifier.h
index d40d51e2d3376..ad137baff5d42 100644
--- a/llvm/include/llvm/Analysis/IRSimilarityIdentifier.h
+++ b/llvm/include/llvm/Analysis/IRSimilarityIdentifier.h
@@ -127,7 +127,7 @@ struct IRInstructionData
/// This is only relevant if we are wrapping a CmpInst where we needed to
/// change the predicate of a compare instruction from a greater than form
- /// to a less than form. It is None otherwise.
+ /// to a less than form. It is std::nullopt otherwise.
std::optional<CmpInst::Predicate> RevisedPredicate;
/// This is only relevant if we are wrapping a CallInst. If we are requiring
diff --git a/llvm/include/llvm/Analysis/LoopInfo.h b/llvm/include/llvm/Analysis/LoopInfo.h
index 763d7f6a8e717..3434630c27cfe 100644
--- a/llvm/include/llvm/Analysis/LoopInfo.h
+++ b/llvm/include/llvm/Analysis/LoopInfo.h
@@ -164,7 +164,7 @@ class LLVM_EXTERNAL_VISIBILITY Loop : public LoopBase<BasicBlock, Loop> {
/// - the step instruction of the induction variable can be found
/// - the final value of the induction variable can be found
///
- /// Else None.
+ /// Else std::nullopt.
static std::optional<Loop::LoopBounds>
getBounds(const Loop &L, PHINode &IndVar, ScalarEvolution &SE);
diff --git a/llvm/include/llvm/CodeGen/MIRFormatter.h b/llvm/include/llvm/CodeGen/MIRFormatter.h
index a039da1bd5b34..203d965836f65 100644
--- a/llvm/include/llvm/CodeGen/MIRFormatter.h
+++ b/llvm/include/llvm/CodeGen/MIRFormatter.h
@@ -35,7 +35,7 @@ class MIRFormatter {
/// Implement target specific printing for machine operand immediate value, so
/// that we can have more meaningful mnemonic than a 64-bit integer. Passing
- /// None to OpIdx means the index is unknown.
+ /// std::nullopt to OpIdx means the index is unknown.
virtual void printImm(raw_ostream &OS, const MachineInstr &MI,
std::optional<unsigned> OpIdx, int64_t Imm) const {
OS << Imm;
diff --git a/llvm/include/llvm/CodeGen/TargetInstrInfo.h b/llvm/include/llvm/CodeGen/TargetInstrInfo.h
index b4a7bbb4c99ce..5aa3e65445894 100644
--- a/llvm/include/llvm/CodeGen/TargetInstrInfo.h
+++ b/llvm/include/llvm/CodeGen/TargetInstrInfo.h
@@ -1966,7 +1966,7 @@ class TargetInstrInfo : public MCInstrInfo {
}
/// Returns a \p outliner::OutlinedFunction struct containing target-specific
- /// information for a set of outlining candidates. Returns None if the
+ /// information for a set of outlining candidates. Returns std::nullopt if the
/// candidates are not suitable for outlining.
virtual std::optional<outliner::OutlinedFunction> getOutliningCandidateInfo(
std::vector<outliner::Candidate> &RepeatedSequenceLocs) const {
diff --git a/llvm/include/llvm/Object/MachO.h b/llvm/include/llvm/Object/MachO.h
index e7a8fcd156f2b..d2abffdc89069 100644
--- a/llvm/include/llvm/Object/MachO.h
+++ b/llvm/include/llvm/Object/MachO.h
@@ -717,7 +717,7 @@ class MachOObjectFile : public ObjectFile {
ArrayRef<uint8_t> getDyldInfoLazyBindOpcodes() const;
ArrayRef<uint8_t> getDyldInfoExportsTrie() const;
- /// If the optional is None, no header was found, but the object was
+ /// If the optional is std::nullopt, no header was found, but the object was
/// well-formed.
Expected<std::optional<MachO::dyld_chained_fixups_header>>
getChainedFixupsHeader() const;
diff --git a/llvm/include/llvm/Support/CachePruning.h b/llvm/include/llvm/Support/CachePruning.h
index 30b5c08942c56..17e148830a73f 100644
--- a/llvm/include/llvm/Support/CachePruning.h
+++ b/llvm/include/llvm/Support/CachePruning.h
@@ -28,8 +28,8 @@ class StringRef;
struct CachePruningPolicy {
/// The pruning interval. This is intended to be used to avoid scanning the
/// directory too often. It does not impact the decision of which file to
- /// prune. A value of 0 forces the scan to occur. A value of None disables
- /// pruning.
+ /// prune. A value of 0 forces the scan to occur. A value of std::nullopt
+ /// disables pruning.
std::optional<std::chrono::seconds> Interval = std::chrono::seconds(1200);
/// The expiration for a file. When a file hasn't been accessed for Expiration
diff --git a/llvm/include/llvm/Support/Format.h b/llvm/include/llvm/Support/Format.h
index c22c941ae06ef..3b93a0f206523 100644
--- a/llvm/include/llvm/Support/Format.h
+++ b/llvm/include/llvm/Support/Format.h
@@ -215,7 +215,8 @@ inline FormattedNumber format_decimal(int64_t N, unsigned Width) {
class FormattedBytes {
ArrayRef<uint8_t> Bytes;
- // If not None, display offsets for each line relative to starting value.
+ // If not std::nullopt, display offsets for each line relative to starting
+ // value.
std::optional<uint64_t> FirstByteOffset;
uint32_t IndentLevel; // Number of characters to indent each line.
uint32_t NumPerLine; // Number of bytes to show per line.
diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp
index 3491bcefdcbf7..789c2902369b9 100644
--- a/llvm/lib/Analysis/LazyValueInfo.cpp
+++ b/llvm/lib/Analysis/LazyValueInfo.cpp
@@ -162,7 +162,7 @@ namespace {
struct BlockCacheEntry {
SmallDenseMap<AssertingVH<Value>, ValueLatticeElement, 4> LatticeElements;
SmallDenseSet<AssertingVH<Value>, 4> OverDefined;
- // None indicates that the nonnull pointers for this basic block
+ // std::nullopt indicates that the nonnull pointers for this basic block
// block have not been computed yet.
std::optional<NonNullPointerSet> NonNullPointers;
};
diff --git a/llvm/lib/CodeGen/ImplicitNullChecks.cpp b/llvm/lib/CodeGen/ImplicitNullChecks.cpp
index fa493af0eea72..ae002e074add2 100644
--- a/llvm/lib/CodeGen/ImplicitNullChecks.cpp
+++ b/llvm/lib/CodeGen/ImplicitNullChecks.cpp
@@ -94,7 +94,7 @@ class ImplicitNullChecks : public MachineFunctionPass {
/// computeDependence).
bool CanReorder;
- /// If non-None, then an instruction in \p Insts that also must be
+ /// If non-std::nullopt, then an instruction in \p Insts that also must be
/// hoisted.
std::optional<ArrayRef<MachineInstr *>::iterator> PotentialDependence;
diff --git a/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.h b/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.h
index cb0008a5ce6ed..772aa4079a6d8 100644
--- a/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.h
+++ b/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.h
@@ -1197,7 +1197,7 @@ class InstrRefBasedLDV : public LDVImpl {
/// For an instruction reference given by \p InstNo and \p OpNo in instruction
/// \p MI returns the Value pointed to by that instruction reference if any
- /// exists, otherwise returns None.
+ /// exists, otherwise returns std::nullopt.
std::optional<ValueIDNum> getValueForInstrRef(unsigned InstNo, unsigned OpNo,
MachineInstr &MI,
const ValueTable *MLiveOuts,
diff --git a/llvm/lib/FileCheck/FileCheckImpl.h b/llvm/lib/FileCheck/FileCheckImpl.h
index fd3568e7a5b06..3a3f4ecdfb90b 100644
--- a/llvm/lib/FileCheck/FileCheckImpl.h
+++ b/llvm/lib/FileCheck/FileCheckImpl.h
@@ -269,7 +269,7 @@ class NumericVariable {
std::optional<ExpressionValue> Value;
/// The input buffer's string from which Value was parsed, or std::nullopt.
- /// See comments on getStringValue for a discussion of the None case.
+ /// See comments on getStringValue for a discussion of the std::nullopt case.
std::optional<StringRef> StrValue;
/// Line number where this variable is defined, or std::nullopt if defined
@@ -280,7 +280,7 @@ class NumericVariable {
public:
/// Constructor for a variable \p Name with implicit format \p ImplicitFormat
/// defined at line \p DefLineNumber or defined before input is parsed if
- /// \p DefLineNumber is None.
+ /// \p DefLineNumber is std::nullopt.
explicit NumericVariable(StringRef Name, ExpressionFormat ImplicitFormat,
std::optional<size_t> DefLineNumber = std::nullopt)
: Name(Name), ImplicitFormat(ImplicitFormat),
@@ -304,7 +304,7 @@ class NumericVariable {
/// Sets value of this numeric variable to \p NewValue, and sets the input
/// buffer string from which it was parsed to \p NewStrValue. See comments on
- /// getStringValue for a discussion of when the latter can be None.
+ /// getStringValue for a discussion of when the latter can be std::nullopt.
void setValue(ExpressionValue NewValue,
std::optional<StringRef> NewStrValue = std::nullopt) {
Value = NewValue;
diff --git a/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp b/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
index 33b586e2c1b40..d46e905ad5780 100644
--- a/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
+++ b/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
@@ -3394,7 +3394,8 @@ class TagStoreEdit {
Register FrameReg;
StackOffset FrameRegOffset;
int64_t Size;
- // If not None, move FrameReg to (FrameReg + FrameRegUpdate) at the end.
+ // If not std::nullopt, move FrameReg to (FrameReg + FrameRegUpdate) at the
+ // end.
std::optional<int64_t> FrameRegUpdate;
// MIFlags for any FrameReg updating instructions.
unsigned FrameRegUpdateFlags;
diff --git a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
index 7b1259a2b8529..1dcc1bfd43bda 100644
--- a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+++ b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
@@ -9639,7 +9639,7 @@ class CmpOpInfo {
}
// Creates infos about comparison operations CmpOp0 and CmpOp1.
- // If there is no common operand returns None. Otherwise, returns
+ // If there is no common operand returns std::nullopt. Otherwise, returns
// correspondence info about comparison operations.
static std::optional<std::pair<CmpOpInfo, CmpOpInfo>>
getInfoAbout(SDValue const &CmpOp0, SDValue const &CmpOp1) {
@@ -10007,7 +10007,7 @@ struct NodeExtensionHelper {
}
/// Get or create a value that can feed \p Root with the given extension \p
- /// SExt. If \p SExt is None, this returns the source of this operand.
+ /// SExt. If \p SExt is std::nullopt, this returns the source of this operand.
/// \see ::getSource().
SDValue getOrCreateExtendedOp(const SDNode *Root, SelectionDAG &DAG,
std::optional<bool> SExt) const {
diff --git a/llvm/lib/Transforms/IPO/AttributorAttributes.cpp b/llvm/lib/Transforms/IPO/AttributorAttributes.cpp
index 6eda254244fdb..1c7441a5ae851 100644
--- a/llvm/lib/Transforms/IPO/AttributorAttributes.cpp
+++ b/llvm/lib/Transforms/IPO/AttributorAttributes.cpp
@@ -7241,7 +7241,8 @@ struct AAPrivatizablePtrImpl : public AAPrivatizablePtr {
}
/// Identify the type we can chose for a private copy of the underlying
- /// argument. None means it is not clear yet, nullptr means there is none.
+ /// argument. std::nullopt means it is not clear yet, nullptr means there is
+ /// none.
virtual std::optional<Type *> identifyPrivatizableType(Attributor &A) = 0;
/// Return a privatizable type that encloses both T0 and T1.
More information about the llvm-commits
mailing list