averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate llvm::Optional to std::optional

Browse Source 
LLVM has removed llvm::Optional, move over to std::optional. Also
clang-format to fix up all the renamed #includes.
This commit is contained in:
Ben Barham
2024-02-02 22:19:39 -08:00
parent d3d4bd203c
commit ef8825bfe6
810 changed files with 8035 additions and 8718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/SILOptimizer/Mandatory/OSLogOptimization.cpp
View File

@@ -411,7 +411,7 @@ static bool detectAndDiagnoseErrors(SymbolicValue errorInfo,
/// instructions discovered during the evaluation to
/// 'foldState.constantSILValues'.
/// \returns error information if the evaluation failed.
static llvm::Optional<SymbolicValue> collectConstants(FoldState &foldState) {
static std::optional<SymbolicValue> collectConstants(FoldState &foldState) {
ConstExprStepEvaluator &constantEvaluator = foldState.constantEvaluator;
SILBasicBlock::iterator currI = foldState.beginInstruction->getIterator();
@@ -428,8 +428,8 @@ static llvm::Optional<SymbolicValue> collectConstants(FoldState &foldState) {
// Initialize string info from this instruction if possible.
foldState.stringInfo.extractStringInfoFromInstruction(currInst);
llvm::Optional<SymbolicValue> errorInfo = llvm::None;
llvm::Optional<SILBasicBlock::iterator> nextI = llvm::None;
std::optional<SymbolicValue> errorInfo = std::nullopt;
std::optional<SILBasicBlock::iterator> nextI = std::nullopt;
std::tie(nextI, errorInfo) = evaluateOrSkip(constantEvaluator, currI);
@@ -445,7 +445,7 @@ static llvm::Optional<SymbolicValue> collectConstants(FoldState &foldState) {
// We cannot find the next instruction to continue evaluation, and we
// haven't seen any reportable errors during evaluation. Therefore,
// consider this the end point of evaluation.
return llvm::None; // No error.
return std::nullopt; // No error.
}
// Set the next instruction to continue evaluation from.
@@ -457,14 +457,14 @@ static llvm::Optional<SymbolicValue> collectConstants(FoldState &foldState) {
if (!isSILValueFoldable(instructionResult))
continue;
llvm::Optional<SymbolicValue> constantVal =
std::optional<SymbolicValue> constantVal =
constantEvaluator.lookupConstValue(instructionResult);
if (constantVal.has_value()) {
foldState.addConstantSILValue(instructionResult);
}
}
}
return llvm::None; // No error.
return std::nullopt; // No error.
}
/// Generate SIL code to create an array of constant size from the given
@@ -744,7 +744,7 @@ static SILValue emitCodeForSymbolicValue(SymbolicValue symVal,
SmallVector<SILValue, 4> capturedSILVals;
for (SymbolicClosureArgument capture : captures) {
SILValue captureOperand = capture.first;
llvm::Optional<SymbolicValue> captureSymVal = capture.second;
std::optional<SymbolicValue> captureSymVal = capture.second;
assert(captureSymVal);
// Note that the captured operand type may have generic parameters which
// has to be substituted with the substitution map that was inferred by
@@ -840,7 +840,7 @@ getEndPointsOfDataDependentChain(SingleValueInstruction *value, SILFunction *fun
/// value, if there is exactly one such introducing value. Otherwise, return
/// None. There can be multiple borrow scopes for a SILValue iff it is derived
/// from a guaranteed basic block parameter representing a phi node.
static llvm::Optional<BorrowedValue>
static std::optional<BorrowedValue>
getUniqueBorrowScopeIntroducingValue(SILValue value) {
assert(value->getOwnershipKind() == OwnershipKind::Guaranteed &&
"parameter must be a guaranteed value");
@@ -901,7 +901,7 @@ static void replaceAllUsesAndFixLifetimes(SILValue foldedVal,
// casts. There's no reason to think that it's valid to replace uses of
// originalVal with a new borrow of the "introducing value". All casts
// potentially need to be cloned.
llvm::Optional<BorrowedValue> originalScopeBegin =
std::optional<BorrowedValue> originalScopeBegin =
getUniqueBorrowScopeIntroducingValue(originalVal);
assert(originalScopeBegin &&
"value without a unique borrow scope should not have been folded");
@@ -960,7 +960,7 @@ static void substituteConstants(FoldState &foldState) {
// value at the point where the owned value is defined.
SILInstruction *insertionPoint = definingInst;
if (constantSILValue->getOwnershipKind() == OwnershipKind::Guaranteed) {
llvm::Optional<BorrowedValue> borrowIntroducer =
std::optional<BorrowedValue> borrowIntroducer =
getUniqueBorrowScopeIntroducingValue(constantSILValue);
if (!borrowIntroducer) {
// This case happens only if constantSILValue is derived from a
@@ -1000,7 +1000,7 @@ static bool checkOSLogMessageIsConstant(SingleValueInstruction *osLogMessage,
SILModule &module = fn->getModule();
ASTContext &astContext = fn->getASTContext();
llvm::Optional<SymbolicValue> osLogMessageValueOpt =
std::optional<SymbolicValue> osLogMessageValueOpt =
constantEvaluator.lookupConstValue(osLogMessage);
if (!osLogMessageValueOpt ||
osLogMessageValueOpt->getKind() != SymbolicValue::Aggregate) {