use new llvm::Optional APIs to fix deprecation warnings

eeckstein · eeckstein · commit 6b1697eb06e3 · 2023-06-28T14:28:38.000+02:00
diff --git a/include/swift/Basic/Lazy.h b/include/swift/Basic/Lazy.h
@@ -39,7 +39,7 @@ class LazyValue {
   LazyValue(Initializer Init) : Init(Init){};
 
   T &get() {
-    if (!Value.hasValue()) {
+    if (!Value.has_value()) {
       Value = Init();
     }
     return Value.value();
diff --git a/lib/AST/Module.cpp b/lib/AST/Module.cpp
@@ -3232,7 +3232,7 @@ RestrictedImportKind SourceFile::getRestrictedImportKind(const ModuleDecl *modul
 
 ImportAccessLevel
 SourceFile::getImportAccessLevel(const ModuleDecl *targetModule) const {
-  assert(Imports.hasValue());
+  assert(Imports.has_value());
 
   // Leave it to the caller to avoid calling this service for a self import.
   // We want to return AccessLevel::Public, but there's no import site to return.
diff --git a/lib/AST/ParameterPack.cpp b/lib/AST/ParameterPack.cpp
@@ -481,7 +481,7 @@ static CanPackType getApproximateFormalPackType(const ASTContext &ctx,
       formalEltTypes->push_back(formalEltType);
     }
 
-    assert(isLegal || formalEltTypes.hasValue());
+    assert(isLegal || formalEltTypes.has_value());
   }
 
   // Use the array we built if we made one (if we ever saw a non-legal
diff --git a/lib/IDE/Utils.cpp b/lib/IDE/Utils.cpp
@@ -702,7 +702,7 @@ void swift::ide::SourceEditConsumer::acceptMacroExpansionBuffer(
       containingSF->getParentModule()->getSourceFileContainingLocation(
           originalSourceRange.getStart());
   StringRef originalPath;
-  if (originalFile->getBufferID().hasValue() &&
+  if (originalFile->getBufferID().has_value() &&
       containingSF->getBufferID() != originalFile->getBufferID()) {
     originalPath = SM.getIdentifierForBuffer(*originalFile->getBufferID());
   }
diff --git a/lib/IRGen/IRGenDebugInfo.cpp b/lib/IRGen/IRGenDebugInfo.cpp
@@ -2700,7 +2700,7 @@ void IRGenDebugInfoImpl::emitVariableDeclaration(
 
       return llvm::DIExpression::createFragmentExpression(
                  DIExpr, PieceFragment.OffsetInBits, PieceFragment.SizeInBits)
-          .getValueOr(nullptr);
+          .value_or(nullptr);
     }
 
     llvm::SmallVector<uint64_t, 2> Operands;
@@ -2715,7 +2715,7 @@ void IRGenDebugInfoImpl::emitVariableDeclaration(
     if (VarFragment.SizeInBits)
       DIExpr = llvm::DIExpression::createFragmentExpression(
                    DIExpr, VarFragment.OffsetInBits, VarFragment.SizeInBits)
-                   .getValueOr(nullptr);
+                   .value_or(nullptr);
 
     if (!DIExpr)
       return nullptr;
@@ -2726,7 +2726,7 @@ void IRGenDebugInfoImpl::emitVariableDeclaration(
     if (PieceFragment.SizeInBits)
       return llvm::DIExpression::createFragmentExpression(
                  DIExpr, PieceFragment.OffsetInBits, PieceFragment.SizeInBits)
-          .getValueOr(nullptr);
+          .value_or(nullptr);
 
     return DIExpr;
   };
diff --git a/lib/IRGen/TypeLayout.cpp b/lib/IRGen/TypeLayout.cpp
@@ -243,7 +243,7 @@ class LayoutStringBuilder {
                                        compactXIByteCount << 59 |
                                        enumData.xiOffset;
         B.addInt64(byteCountsAndOffset);
-        B.addSize(enumData.payload->fixedSize(IGM).getValue());
+        B.addSize(enumData.payload->fixedSize(IGM).value());
         B.addInt64(enumData.zeroTagValue);
         B.addSize(Size(enumData.xiTagValues));
         auto nestedRefCountBytesPlaceholder =
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
@@ -1668,7 +1668,7 @@ ParserResult<Expr> Parser::parseExprPrimary(Diag<> ID, bool isExprBasic) {
   case tok::kw_self: {   // self
     auto canParseBindingInPattern = [&]() {
       if (InBindingPattern != PatternBindingState::ImplicitlyImmutable &&
-          !InBindingPattern.getIntroducer().hasValue()) {
+          !InBindingPattern.getIntroducer().has_value()) {
         return false;
       }
       // If we have "case let x.", "case let x(", or "case let x[", we parse 'x'
@@ -1699,7 +1699,7 @@ ParserResult<Expr> Parser::parseExprPrimary(Diag<> ID, bool isExprBasic) {
       // If we have an inout/let/var, set that as our introducer. otherwise
       // default to Let.
       auto introducer =
-          InBindingPattern.getIntroducer().getValueOr(VarDecl::Introducer::Let);
+          InBindingPattern.getIntroducer().value_or(VarDecl::Introducer::Let);
       auto pattern = createBindingFromPattern(loc, name, introducer);
       return makeParserResult(new (Context) UnresolvedPatternExpr(pattern));
     }
diff --git a/lib/Parse/ParsePattern.cpp b/lib/Parse/ParsePattern.cpp
@@ -1065,7 +1065,7 @@ ParserResult<Pattern> Parser::parseTypedPattern() {
 ///
 ParserResult<Pattern> Parser::parsePattern() {
   auto introducer =
-      InBindingPattern.getIntroducer().getValueOr(VarDecl::Introducer::Let);
+      InBindingPattern.getIntroducer().value_or(VarDecl::Introducer::Let);
   switch (Tok.getKind()) {
   case tok::l_paren:
     return parsePatternTuple();
@@ -1119,7 +1119,7 @@ ParserResult<Pattern> Parser::parsePattern() {
     SourceLoc varLoc = consumeToken();
 
     // 'var', 'let', 'inout' patterns shouldn't nest.
-    if (InBindingPattern.getIntroducer().hasValue()) {
+    if (InBindingPattern.getIntroducer().has_value()) {
       auto diag = diag::var_pattern_in_var;
       unsigned index = *newBindingState.getSelectIndexForIntroducer();
       if (Context.LangOpts.hasFeature(Feature::ReferenceBindings)) {
@@ -1150,7 +1150,7 @@ ParserResult<Pattern> Parser::parsePattern() {
       return nullptr;
     return makeParserResult(new (Context) BindingPattern(
         varLoc,
-        newBindingState.getIntroducer().getValueOr(VarDecl::Introducer::Var),
+        newBindingState.getIntroducer().value_or(VarDecl::Introducer::Var),
         subPattern.get()));
   }
       
@@ -1347,7 +1347,7 @@ ParserResult<Pattern>
 Parser::parseMatchingPatternAsBinding(PatternBindingState newState,
                                       SourceLoc varLoc, bool isExprBasic) {
   // 'var', 'let', 'inout' patterns shouldn't nest.
-  if (InBindingPattern.getIntroducer().hasValue()) {
+  if (InBindingPattern.getIntroducer().has_value()) {
     auto diag = diag::var_pattern_in_var;
     if (Context.LangOpts.hasFeature(Feature::ReferenceBindings))
       diag = diag::var_pattern_in_var_inout;
@@ -1372,7 +1372,7 @@ Parser::parseMatchingPatternAsBinding(PatternBindingState newState,
   if (subPattern.isNull())
     return nullptr;
   auto *varP = new (Context) BindingPattern(
-      varLoc, newState.getIntroducer().getValueOr(VarDecl::Introducer::Var),
+      varLoc, newState.getIntroducer().value_or(VarDecl::Introducer::Var),
       subPattern.get());
   return makeParserResult(ParserStatus(subPattern), varP);
 }
diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp
@@ -1663,7 +1663,7 @@ Parser::parseStmtConditionElement(SmallVectorImpl<StmtConditionElement> &result,
     consumeToken(tok::kw_case);
 
     auto newPatternBindingState = PatternBindingState::get(BindingKindStr)
-      .getValueOr(PatternBindingState(PatternBindingState::InVar));
+      .value_or(PatternBindingState(PatternBindingState::InVar));
     BindingKindStr = "case";
     
     // In our recursive parse, remember that we're in a var/let pattern.
@@ -1693,7 +1693,7 @@ Parser::parseStmtConditionElement(SmallVectorImpl<StmtConditionElement> &result,
     // Otherwise, this is an implicit optional binding "if let".
     ThePattern = parseMatchingPatternAsBinding(
         PatternBindingState::get(BindingKindStr)
-            .getValueOr(PatternBindingState(PatternBindingState::InVar)),
+            .value_or(PatternBindingState(PatternBindingState::InVar)),
         IntroducerLoc,
         /*isExprBasic*/ true);
     // The let/var pattern is part of the statement.
diff --git a/lib/PrintAsClang/ModuleContentsWriter.cpp b/lib/PrintAsClang/ModuleContentsWriter.cpp
@@ -878,7 +878,7 @@ class ModuleWriter {
         os << " { } SWIFT_UNAVAILABLE_MSG(\"";
 
         auto diag =
-            representation.isUnsupported() && representation.error.hasValue()
+            representation.isUnsupported() && representation.error.has_value()
                 ? cxx_translation::diagnoseRepresenationError(
                       *representation.error, const_cast<ValueDecl *>(vd))
                 : Diagnostic(
diff --git a/lib/SIL/IR/AbstractionPattern.cpp b/lib/SIL/IR/AbstractionPattern.cpp
@@ -554,7 +554,7 @@ TupleElementGenerator::TupleElementGenerator(
   assert(origTupleType.matchesTuple(substType));
 
   origTupleVanishes =
-    origTupleType.getVanishingTupleElementPatternType().hasValue();
+    origTupleType.getVanishingTupleElementPatternType().has_value();
   origTupleTypeIsOpaque = origTupleType.isOpaqueTuple();
   numOrigElts = origTupleType.getNumTupleElements();
 
diff --git a/lib/SILGen/ResultPlan.cpp b/lib/SILGen/ResultPlan.cpp
@@ -1324,7 +1324,7 @@ ResultPlanPtr ResultPlanBuilder::buildForTuple(Initialization *init,
   // emit directly into the initialization.  If the orig tuple vanishes,
   // that counts as the initialization being splittable.
   if (init) {
-    bool vanishes = origType.getVanishingTupleElementPatternType().hasValue();
+    bool vanishes = origType.getVanishingTupleElementPatternType().has_value();
     if (vanishes || init->canSplitIntoTupleElements()) {
       return ResultPlanPtr(
         new TupleInitializationResultPlan(*this, init, origType, substType,
diff --git a/lib/SILGen/SILGenApply.cpp b/lib/SILGen/SILGenApply.cpp
@@ -3418,7 +3418,7 @@ class ArgEmitter {
     // this as if the argument source was wrapped in an extra level of
     // tuple literal.
     bool origTupleVanishes =
-      origParamType.getVanishingTupleElementPatternType().hasValue();
+      origParamType.getVanishingTupleElementPatternType().has_value();
 
     auto substType = arg.getSubstRValueType();
 
diff --git a/lib/SILGen/SILGenStmt.cpp b/lib/SILGen/SILGenStmt.cpp
@@ -589,7 +589,7 @@ prepareIndirectResultInit(SILGenFunction &SGF, SILLocation loc,
     SmallVector<InitializationPtr, 1> singletonEltInit;
 
     bool vanishes =
-      origResultType.getVanishingTupleElementPatternType().hasValue();
+      origResultType.getVanishingTupleElementPatternType().has_value();
     if (!vanishes) {
       auto resultTupleType = cast<TupleType>(resultType);
       tupleInit = new TupleInitialization(resultTupleType);
diff --git a/lib/SILOptimizer/Mandatory/ClosureLifetimeFixup.cpp b/lib/SILOptimizer/Mandatory/ClosureLifetimeFixup.cpp
@@ -749,7 +749,7 @@ static SILValue tryRewriteToPartialApplyStack(
     // Is the capture a borrow?
     auto paramIndex = newPA
       ->getArgumentIndexForOperandIndex(i + newPA->getArgumentOperandNumber())
-      .getValue();
+      .value();
     if (!newPA->getOrigCalleeType()->getParameters()[paramIndex]
           .isIndirectInGuaranteed()) {
       LLVM_DEBUG(llvm::dbgs() << "-- not an in_guaranteed parameter\n";
diff --git a/lib/SILOptimizer/Mandatory/MoveOnlyBorrowToDestructureUtils.cpp b/lib/SILOptimizer/Mandatory/MoveOnlyBorrowToDestructureUtils.cpp
@@ -741,7 +741,7 @@ AvailableValues &Implementation::computeAvailableValues(SILBasicBlock *block) {
                  << "        Recursively loading its available values!\n");
       auto &predAvailableValues = computeAvailableValues(bb);
       for (unsigned i : range(predAvailableValues.size())) {
-        if (!smallestTypeAvailable[i].hasValue())
+        if (!smallestTypeAvailable[i].has_value())
           continue;
 
         if (!predAvailableValues[i]) {
diff --git a/lib/Sema/CSDiagnostics.cpp b/lib/Sema/CSDiagnostics.cpp
@@ -3625,7 +3625,7 @@ bool NonClassTypeToAnyObjectConversionFailure::diagnoseAsError() {
     diagnostic = diag::cannot_convert_initializer_value_anyobject;
   }
 
-  if (diagnostic.hasValue()) {
+  if (diagnostic.has_value()) {
     emitDiagnostic(*diagnostic, fromType, toType);
     return true;
   }
diff --git a/lib/Sema/CSSyntacticElement.cpp b/lib/Sema/CSSyntacticElement.cpp
@@ -1199,7 +1199,7 @@ class SyntacticElementConstraintGenerator
           element,
           cs.getConstraintLocator(locator,
                                   LocatorPathElt::SyntacticElement(element)),
-          contextInfo.getValueOr(ContextualTypeInfo()), isDiscarded));
+          contextInfo.value_or(ContextualTypeInfo()), isDiscarded));
     }
 
     createConjunction(cs, elements, locator);
diff --git a/lib/Sema/TypeCheckDeclObjC.cpp b/lib/Sema/TypeCheckDeclObjC.cpp
@@ -2998,7 +2998,7 @@ class ObjCImplementationChecker {
 
   static ObjCSelector getExplicitObjCName(ValueDecl *VD) {
     if (auto attr = VD->getAttrs().getAttribute<ObjCAttr>())
-      return attr->getName().getValueOr(ObjCSelector());
+      return attr->getName().value_or(ObjCSelector());
     return ObjCSelector();
   }
 
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
@@ -2679,7 +2679,7 @@ TypeResolver::resolvePackElementArchetype(
     TypeResolutionOptions options) {
   assert(silContext);
   assert(attrs.has(TAK_pack_element));
-  assert(attrs.OpenedID.hasValue());
+  assert(attrs.OpenedID.has_value());
 
   attrs.clearAttribute(TAK_pack_element);
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class LazyValue {`
`39`	`39`	`LazyValue(Initializer Init) : Init(Init){};`
`40`	`40`
`41`	`41`	`T &get() {`
`42`		`- if (!Value.hasValue()) {`
	`42`	`+ if (!Value.has_value()) {`
`43`	`43`	`Value = Init();`
`44`	`44`	`}`
`45`	`45`	`return Value.value();`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ static CanPackType getApproximateFormalPackType(const ASTContext &ctx,`
`481`	`481`	`formalEltTypes->push_back(formalEltType);`
`482`	`482`	`}`
`483`	`483`
`484`		`- assert(isLegal \|\| formalEltTypes.hasValue());`
	`484`	`+ assert(isLegal \|\| formalEltTypes.has_value());`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`// Use the array we built if we made one (if we ever saw a non-legal`
Original file line number	Diff line number	Diff line change
`@@ -702,7 +702,7 @@ void swift::ide::SourceEditConsumer::acceptMacroExpansionBuffer(`
`702`	`702`	`containingSF->getParentModule()->getSourceFileContainingLocation(`
`703`	`703`	`originalSourceRange.getStart());`
`704`	`704`	`StringRef originalPath;`
`705`		`- if (originalFile->getBufferID().hasValue() &&`
	`705`	`+ if (originalFile->getBufferID().has_value() &&`
`706`	`706`	`containingSF->getBufferID() != originalFile->getBufferID()) {`
`707`	`707`	`originalPath = SM.getIdentifierForBuffer(*originalFile->getBufferID());`
`708`	`708`	`}`