Migrate llvm::Optional to std::optional

include/swift/ABI/ObjectFile.h

@@ -7,9 +7,9 @@
 #ifndef SWIFT_ABI_OBJECTFILE_H
 #define SWIFT_ABI_OBJECTFILE_H
 
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/ErrorHandling.h"
+#include <optional>
 
 namespace swift {
 
@@ -27,12 +27,10 @@ class SwiftObjectFileFormat {
 public:
   virtual ~SwiftObjectFileFormat() {}
   virtual llvm::StringRef getSectionName(ReflectionSectionKind section) = 0;
-  virtual llvm::Optional<llvm::StringRef> getSegmentName() {
-    return {};
-  }
+  virtual std::optional<llvm::StringRef> getSegmentName() { return {}; }
   /// Get the name of the segment in the symbol rich binary that may contain
   /// Swift metadata.
-  virtual llvm::Optional<llvm::StringRef> getSymbolRichSegmentName() {
+  virtual std::optional<llvm::StringRef> getSymbolRichSegmentName() {
     return {};
   }
   /// Predicate to identify if the named section can contain reflection data.
@@ -53,11 +51,11 @@ class SwiftObjectFileFormatMachO : public SwiftObjectFileFormat {
     llvm_unreachable("Section type not found.");
   }
 
-  llvm::Optional<llvm::StringRef> getSegmentName() override {
+  std::optional<llvm::StringRef> getSegmentName() override {
     return {"__TEXT"};
   }
 
-  llvm::Optional<llvm::StringRef> getSymbolRichSegmentName() override {
+  std::optional<llvm::StringRef> getSymbolRichSegmentName() override {
     return {"__DWARF"};
   }
 

include/swift/ABI/TypeIdentity.h

@@ -20,7 +20,6 @@
 
 #include "swift/Basic/LLVM.h"
 #include "swift/Runtime/Config.h"
-#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/StringRef.h>
 
 namespace swift {
@@ -188,7 +187,7 @@ class ParsedTypeIdentity {
   llvm::StringRef FullIdentity;
 
   /// Any extended information that type might have.
-  llvm::Optional<TypeImportInfo<llvm::StringRef>> ImportInfo;
+  std::optional<TypeImportInfo<llvm::StringRef>> ImportInfo;
 
   /// The ABI name of the type.
   llvm::StringRef getABIName() const {

include/swift/APIDigester/ModuleAnalyzerNodes.h

@@ -179,7 +179,7 @@ class SDKContext {
   CheckerOptions Opts;
   std::vector<BreakingAttributeInfo> BreakingAttrs;
   // The common version of two ABI/API descriptors under comparison.
-  llvm::Optional<uint8_t> CommonVersion;
+  std::optional<uint8_t> CommonVersion;
 
 public:
   // Define the set of known identifiers.
@@ -232,7 +232,7 @@ class SDKContext {
   const CheckerOptions &getOpts() const { return Opts; }
   bool shouldIgnore(Decl *D, const Decl* Parent = nullptr) const;
   ArrayRef<BreakingAttributeInfo> getBreakingAttributeInfo() const { return BreakingAttrs; }
-  llvm::Optional<uint8_t> getFixedBinaryOrder(ValueDecl *VD) const;
+  std::optional<uint8_t> getFixedBinaryOrder(ValueDecl *VD) const;
 
   CompilerInstance &newCompilerInstance() {
     CIs.emplace_back(new CompilerInstance());
@@ -364,7 +364,7 @@ class SDKNodeDecl: public SDKNode {
   // In ABI mode, this field is populated as a user-friendly version of GenericSig.
   // Diagnostic preferes the sugared versions if they differ as well.
   StringRef SugaredGenericSig;
-  llvm::Optional<uint8_t> FixedBinaryOrder;
+  std::optional<uint8_t> FixedBinaryOrder;
   PlatformIntroVersion introVersions;
   StringRef ObjCName;
 
@@ -446,7 +446,7 @@ class SDKNodeRoot: public SDKNode {
   ArrayRef<SDKNodeDecl*> getDescendantsByUsr(StringRef Usr) {
     return DescendantDeclTable[Usr].getArrayRef();
   }
-  llvm::Optional<StringRef> getSingleModuleName() const;
+  std::optional<StringRef> getSingleModuleName() const;
 };
 
 class SDKNodeType: public SDKNode {
@@ -588,11 +588,11 @@ class SDKNodeDeclType: public SDKNodeDecl {
     return InheritsConvenienceInitializers;
   };
 
-  llvm::Optional<SDKNodeDeclType *> getSuperclass() const;
+  std::optional<SDKNodeDeclType *> getSuperclass() const;
 
   /// Finding the node through all children, including the inherited ones,
   /// whose printed name matches with the given name.
-  llvm::Optional<SDKNodeDecl *> lookupChildByPrintedName(StringRef Name) const;
+  std::optional<SDKNodeDecl *> lookupChildByPrintedName(StringRef Name) const;
   SDKNodeType *getRawValueType() const;
   bool isConformingTo(KnownProtocolKind Kind) const;
   void jsonize(json::Output &out) override;
@@ -686,7 +686,7 @@ class SDKNodeDeclMacro : public SDKNodeDecl {
 class SDKNodeDeclAbstractFunc : public SDKNodeDecl {
   bool IsThrowing;
   bool ReqNewWitnessTableEntry;
-  llvm::Optional<uint8_t> SelfIndex;
+  std::optional<uint8_t> SelfIndex;
 
 protected:
   SDKNodeDeclAbstractFunc(SDKNodeInitInfo Info, SDKNodeKind Kind);
@@ -695,7 +695,7 @@ class SDKNodeDeclAbstractFunc : public SDKNodeDecl {
   bool isThrowing() const { return IsThrowing; }
   bool reqNewWitnessTableEntry() const { return ReqNewWitnessTableEntry; }
   uint8_t getSelfIndex() const { return SelfIndex.value(); }
-  llvm::Optional<uint8_t> getSelfIndexOptional() const { return SelfIndex; }
+  std::optional<uint8_t> getSelfIndexOptional() const { return SelfIndex; }
   bool hasSelfIndex() const { return SelfIndex.has_value(); }
   static bool classof(const SDKNode *N);
   virtual void jsonize(json::Output &out) override;

include/swift/AST/ASTContext.h

@@ -172,7 +172,7 @@ enum class KnownFoundationEntity {
 
 /// Retrieve the Foundation entity kind for the given Objective-C
 /// entity name.
-llvm::Optional<KnownFoundationEntity> getKnownFoundationEntity(StringRef name);
+std::optional<KnownFoundationEntity> getKnownFoundationEntity(StringRef name);
 
 /// Retrieve the Swift name for the given Foundation entity, where
 /// "NS" prefix stripping will apply under omit-needless-words.
@@ -362,7 +362,7 @@ class ASTContext final {
   unsigned NumTypoCorrections = 0;
 
   /// Cached mapping from types to their associated tangent spaces.
-  llvm::DenseMap<Type, llvm::Optional<TangentSpace>> AutoDiffTangentSpaces;
+  llvm::DenseMap<Type, std::optional<TangentSpace>> AutoDiffTangentSpaces;
 
   /// A cache of derivative function types per configuration.
   llvm::DenseMap<SILAutoDiffDerivativeFunctionKey, CanSILFunctionType>
@@ -845,7 +845,7 @@ class ASTContext final {
   /// SIL analog of \c ASTContext::getClangFunctionType .
   const clang::Type *
   getCanonicalClangFunctionType(ArrayRef<SILParameterInfo> params,
-                                llvm::Optional<SILResultInfo> result,
+                                std::optional<SILResultInfo> result,
                                 SILFunctionType::Representation trueRep);
 
   /// Instantiates "Impl.Converter" if needed, then translate Swift generic
@@ -1572,7 +1572,7 @@ class ASTContext final {
 private:
   friend Decl;
 
-  llvm::Optional<ExternalSourceLocs *> getExternalSourceLocs(const Decl *D);
+  std::optional<ExternalSourceLocs *> getExternalSourceLocs(const Decl *D);
   void setExternalSourceLocs(const Decl *D, ExternalSourceLocs *Locs);
 
   friend TypeBase;

include/swift/AST/ASTDemangler.h

@@ -27,8 +27,8 @@
 #include "swift/Demangling/NamespaceMacros.h"
 #include "swift/Demangling/TypeDecoder.h"
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringRef.h"
+#include <optional>
 
 namespace swift {
 
@@ -151,7 +151,7 @@ class ASTBuilder {
       Demangle::ImplParameterConvention calleeConvention,
       ArrayRef<Demangle::ImplFunctionParam<Type>> params,
       ArrayRef<Demangle::ImplFunctionResult<Type>> results,
-      llvm::Optional<Demangle::ImplFunctionResult<Type>> errorResult,
+      std::optional<Demangle::ImplFunctionResult<Type>> errorResult,
       ImplFunctionTypeFlags flags);
 
   Type createProtocolCompositionType(ArrayRef<ProtocolDecl *> protocols,
@@ -169,11 +169,11 @@ class ASTBuilder {
 
   Type createExistentialMetatypeType(
       Type instance,
-      llvm::Optional<Demangle::ImplMetatypeRepresentation> repr = llvm::None);
+      std::optional<Demangle::ImplMetatypeRepresentation> repr = std::nullopt);
 
   Type createMetatypeType(
       Type instance,
-      llvm::Optional<Demangle::ImplMetatypeRepresentation> repr = llvm::None);
+      std::optional<Demangle::ImplMetatypeRepresentation> repr = std::nullopt);
 
   void pushGenericParams(ArrayRef<std::pair<unsigned, unsigned>> parameterPacks);
   void popGenericParams();
@@ -252,7 +252,7 @@ class ASTBuilder {
     SynthesizedByImporter
   };
 
-  llvm::Optional<ForeignModuleKind> getForeignModuleKind(NodePointer node);
+  std::optional<ForeignModuleKind> getForeignModuleKind(NodePointer node);
 
   GenericTypeDecl *findTypeDecl(DeclContext *dc,
                                 Identifier name,

include/swift/AST/ASTMangler.h

@@ -18,7 +18,7 @@
 #include "swift/AST/Types.h"
 #include "swift/Basic/Mangler.h"
 #include "swift/Basic/TaggedUnion.h"
-#include "llvm/ADT/Optional.h"
+#include <optional>
 
 namespace clang {
 class NamedDecl;
@@ -255,7 +255,7 @@ class ASTMangler : public Mangler {
   /// predefined in the Swift runtime for the given type signature.
   std::string mangleObjCAsyncCompletionHandlerImpl(
       CanSILFunctionType BlockType, CanType ResultType, CanGenericSignature Sig,
-      llvm::Optional<bool> FlagParamIsZeroOnError, bool predefined);
+      std::optional<bool> FlagParamIsZeroOnError, bool predefined);
 
   /// Mangle the derivative function (JVP/VJP), or optionally its vtable entry
   /// thunk, for the given:
@@ -377,7 +377,7 @@ class ASTMangler : public Mangler {
     ClangImporterContext,
   };
 
-  static llvm::Optional<SpecialContext>
+  static std::optional<SpecialContext>
   getSpecialManglingContext(const ValueDecl *decl, bool useObjCProtocolNames);
 
   static bool isCXXCFOptionsDefinition(const ValueDecl *decl);

include/swift/AST/ASTPrinter.h

@@ -131,7 +131,7 @@ class ASTPrinter {
   ///
   /// Callers should use callPrintDeclPre().
   virtual void printDeclPre(const Decl *D,
-                            llvm::Optional<BracketOptions> Bracket) {}
+                            std::optional<BracketOptions> Bracket) {}
   /// Called before printing at the point which would be considered the location
   /// of the declaration (normally the name of the declaration).
   ///
@@ -146,7 +146,7 @@ class ASTPrinter {
   ///
   /// Callers should use callPrintDeclPost().
   virtual void printDeclPost(const Decl *D,
-                             llvm::Optional<BracketOptions> Bracket) {}
+                             std::optional<BracketOptions> Bracket) {}
 
   /// Called before printing the result type of the declaration. Printer can
   /// replace \p TL to customize the input.
@@ -175,13 +175,13 @@ class ASTPrinter {
   /// Called before printing a synthesized extension.
   virtual void
   printSynthesizedExtensionPre(const ExtensionDecl *ED, TypeOrExtensionDecl NTD,
-                               llvm::Optional<BracketOptions> Bracket) {}
+                               std::optional<BracketOptions> Bracket) {}
 
   /// Called after printing a synthesized extension.
   virtual void
   printSynthesizedExtensionPost(const ExtensionDecl *ED,
                                 TypeOrExtensionDecl TargetDecl,
-                                llvm::Optional<BracketOptions> Bracket) {}
+                                std::optional<BracketOptions> Bracket) {}
 
   /// Called before printing a structured entity.
   ///
@@ -303,11 +303,10 @@ class ASTPrinter {
   // MARK: Callback interface wrappers that perform ASTPrinter bookkeeping.
 
    /// Make a callback to printDeclPre(), performing any necessary bookkeeping.
-  void callPrintDeclPre(const Decl *D, llvm::Optional<BracketOptions> Bracket);
+  void callPrintDeclPre(const Decl *D, std::optional<BracketOptions> Bracket);
 
   /// Make a callback to printDeclPost(), performing any necessary bookkeeping.
-  void callPrintDeclPost(const Decl *D,
-                         llvm::Optional<BracketOptions> Bracket) {
+  void callPrintDeclPost(const Decl *D, std::optional<BracketOptions> Bracket) {
     printDeclPost(D, Bracket);
   }
 

include/swift/AST/ASTScope.h

@@ -37,10 +37,10 @@
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/NullablePtr.h"
 #include "swift/Basic/SourceManager.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
+#include <optional>
 
 /// In case there's a bug in the ASTScope lookup system, suggest that the user
 /// try disabling it.
@@ -164,7 +164,7 @@ class ASTScopeImpl : public ASTAllocated<ASTScopeImpl> {
   /// Child scopes, sorted by source range.
   Children storedChildren;
 
-  mutable llvm::Optional<SourceRange> cachedCharSourceRange;
+  mutable std::optional<SourceRange> cachedCharSourceRange;
 
 #pragma mark - constructor / destructor
 public:
@@ -995,11 +995,11 @@ class AbstractPatternEntryScope : public ASTScopeImpl {
 
 class PatternEntryDeclScope final : public AbstractPatternEntryScope {
   const bool isLocalBinding;
-  llvm::Optional<SourceLoc> endLoc;
+  std::optional<SourceLoc> endLoc;
 
 public:
   PatternEntryDeclScope(PatternBindingDecl *pbDecl, unsigned entryIndex,
-                        bool isLocalBinding, llvm::Optional<SourceLoc> endLoc)
+                        bool isLocalBinding, std::optional<SourceLoc> endLoc)
       : AbstractPatternEntryScope(ScopeKind::PatternEntryDecl, pbDecl,
                                   entryIndex),
         isLocalBinding(isLocalBinding), endLoc(endLoc) {}

include/swift/AST/ASTTypeIDZone.def

@@ -61,9 +61,9 @@ SWIFT_TYPEID_NAMED(NamedPattern *, NamedPattern)
 SWIFT_TYPEID_NAMED(NominalTypeDecl *, NominalTypeDecl)
 SWIFT_TYPEID_NAMED(OpaqueTypeDecl *, OpaqueTypeDecl)
 SWIFT_TYPEID_NAMED(OperatorDecl *, OperatorDecl)
-SWIFT_TYPEID_NAMED(llvm::Optional<PropertyWrapperLValueness>,
+SWIFT_TYPEID_NAMED(std::optional<PropertyWrapperLValueness>,
                    PropertyWrapperLValueness)
-SWIFT_TYPEID_NAMED(llvm::Optional<PropertyWrapperMutability>,
+SWIFT_TYPEID_NAMED(std::optional<PropertyWrapperMutability>,
                    PropertyWrapperMutability)
 SWIFT_TYPEID_NAMED(ParamDecl *, ParamDecl)
 SWIFT_TYPEID_NAMED(PatternBindingEntry *, PatternBindingEntry)

include/swift/AST/ASTTypeIDs.h

@@ -19,7 +19,7 @@
 
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/TypeID.h"
-#include "llvm/ADT/Optional.h"
+#include <optional>
 
 namespace swift {