Merge pull request #67209 from etcwilde/ewilde/5.9/llvm-all-the-things

🍒[NFC][5.9] add `llvm` namespace to `Optional` and `None`

Author: etcwilde

include/swift/APIDigester/ModuleAnalyzerNodes.h

@@ -179,7 +179,8 @@ class SDKContext {
   CheckerOptions Opts;
   std::vector<BreakingAttributeInfo> BreakingAttrs;
   // The common version of two ABI/API descriptors under comparison.
-  Optional<uint8_t> CommonVersion;
+  llvm::Optional<uint8_t> CommonVersion;
+
 public:
   // Define the set of known identifiers.
 #define IDENTIFIER_WITH_NAME(Name, IdStr) StringRef Id_##Name = IdStr;
@@ -231,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; }
-  Optional<uint8_t> getFixedBinaryOrder(ValueDecl *VD) const;
+  llvm::Optional<uint8_t> getFixedBinaryOrder(ValueDecl *VD) const;
 
   CompilerInstance &newCompilerInstance() {
     CIs.emplace_back(new CompilerInstance());
@@ -363,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;
-  Optional<uint8_t> FixedBinaryOrder;
+  llvm::Optional<uint8_t> FixedBinaryOrder;
   PlatformIntroVersion introVersions;
   StringRef ObjCName;
 
@@ -586,11 +587,11 @@ class SDKNodeDeclType: public SDKNodeDecl {
     return InheritsConvenienceInitializers;
   };
 
-  Optional<SDKNodeDeclType*> getSuperclass() const;
+  llvm::Optional<SDKNodeDeclType *> getSuperclass() const;
 
   /// Finding the node through all children, including the inherited ones,
   /// whose printed name matches with the given name.
-  Optional<SDKNodeDecl*> lookupChildByPrintedName(StringRef Name) const;
+  llvm::Optional<SDKNodeDecl *> lookupChildByPrintedName(StringRef Name) const;
   SDKNodeType *getRawValueType() const;
   bool isConformingTo(KnownProtocolKind Kind) const;
   void jsonize(json::Output &out) override;
@@ -684,7 +685,7 @@ class SDKNodeDeclMacro : public SDKNodeDecl {
 class SDKNodeDeclAbstractFunc : public SDKNodeDecl {
   bool IsThrowing;
   bool ReqNewWitnessTableEntry;
-  Optional<uint8_t> SelfIndex;
+  llvm::Optional<uint8_t> SelfIndex;
 
 protected:
   SDKNodeDeclAbstractFunc(SDKNodeInitInfo Info, SDKNodeKind Kind);
@@ -693,7 +694,7 @@ class SDKNodeDeclAbstractFunc : public SDKNodeDecl {
   bool isThrowing() const { return IsThrowing; }
   bool reqNewWitnessTableEntry() const { return ReqNewWitnessTableEntry; }
   uint8_t getSelfIndex() const { return SelfIndex.value(); }
-  Optional<uint8_t> getSelfIndexOptional() const { return SelfIndex; }
+  llvm::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

@@ -167,7 +167,7 @@ enum class KnownFoundationEntity {
 
 /// Retrieve the Foundation entity kind for the given Objective-C
 /// entity name.
-Optional<KnownFoundationEntity> getKnownFoundationEntity(StringRef name);
+llvm::Optional<KnownFoundationEntity> getKnownFoundationEntity(StringRef name);
 
 /// Retrieve the Swift name for the given Foundation entity, where
 /// "NS" prefix stripping will apply under omit-needless-words.
@@ -337,7 +337,7 @@ class ASTContext final {
   unsigned NumTypoCorrections = 0;
 
   /// Cached mapping from types to their associated tangent spaces.
-  llvm::DenseMap<Type, Optional<TangentSpace>> AutoDiffTangentSpaces;
+  llvm::DenseMap<Type, llvm::Optional<TangentSpace>> AutoDiffTangentSpaces;
 
   /// A cache of derivative function types per configuration.
   llvm::DenseMap<SILAutoDiffDerivativeFunctionKey, CanSILFunctionType>
@@ -797,9 +797,9 @@ class ASTContext final {
   ///
   /// SIL analog of \c ASTContext::getClangFunctionType .
   const clang::Type *
-  getCanonicalClangFunctionType(
-    ArrayRef<SILParameterInfo> params, Optional<SILResultInfo> result,
-    SILFunctionType::Representation trueRep);
+  getCanonicalClangFunctionType(ArrayRef<SILParameterInfo> params,
+                                llvm::Optional<SILResultInfo> result,
+                                SILFunctionType::Representation trueRep);
 
   /// Instantiates "Impl.Converter" if needed, then translate Swift generic
   /// substitutions to equivalent C++ types using \p templateParams and \p
@@ -1020,25 +1020,24 @@ class ASTContext final {
 
   /// Retrieve the module dependencies for the module with the given name.
   ///
-  Optional<const ModuleDependencyInfo*> getModuleDependencies(
-      StringRef moduleName,
-      ModuleDependenciesCache &cache,
+  llvm::Optional<const ModuleDependencyInfo *> getModuleDependencies(
+      StringRef moduleName, ModuleDependenciesCache &cache,
       InterfaceSubContextDelegate &delegate,
-      bool optionalDependencyLookup = false,
-      bool isTestableImport = false,
-      llvm::Optional<std::pair<std::string, swift::ModuleDependencyKind>> dependencyOf = None);
+      bool optionalDependencyLookup = false, bool isTestableImport = false,
+      llvm::Optional<std::pair<std::string, swift::ModuleDependencyKind>>
+          dependencyOf = llvm::None);
 
   /// Retrieve the module dependencies for the Clang module with the given name.
-  Optional<const ModuleDependencyInfo*> getClangModuleDependencies(
-      StringRef moduleName,
-      ModuleDependenciesCache &cache,
-      InterfaceSubContextDelegate &delegate);
+  llvm::Optional<const ModuleDependencyInfo *>
+  getClangModuleDependencies(StringRef moduleName,
+                             ModuleDependenciesCache &cache,
+                             InterfaceSubContextDelegate &delegate);
 
   /// Retrieve the module dependencies for the Swift module with the given name.
-  Optional<const ModuleDependencyInfo*> getSwiftModuleDependencies(
-      StringRef moduleName,
-      ModuleDependenciesCache &cache,
-      InterfaceSubContextDelegate &delegate);
+  llvm::Optional<const ModuleDependencyInfo *>
+  getSwiftModuleDependencies(StringRef moduleName,
+                             ModuleDependenciesCache &cache,
+                             InterfaceSubContextDelegate &delegate);
 
   /// Compute the extra implicit framework search paths on Apple platforms:
   /// $SDKROOT/System/Library/Frameworks/ and $SDKROOT/Library/Frameworks/.
@@ -1496,7 +1495,7 @@ class ASTContext final {
 private:
   friend Decl;
 
-  Optional<ExternalSourceLocs *> getExternalSourceLocs(const Decl *D);
+  llvm::Optional<ExternalSourceLocs *> getExternalSourceLocs(const Decl *D);
   void setExternalSourceLocs(const Decl *D, ExternalSourceLocs *Locs);
 
   friend TypeBase;

include/swift/AST/ASTDemangler.h

@@ -22,12 +22,13 @@
 #ifndef SWIFT_AST_ASTDEMANGLER_H
 #define SWIFT_AST_ASTDEMANGLER_H
 
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
 #include "swift/AST/Types.h"
 #include "swift/Demangling/Demangler.h"
 #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"
 
 namespace swift {
 
@@ -137,11 +138,11 @@ class ASTBuilder {
       FunctionMetadataDifferentiabilityKind diffKind, Type globalActor);
 
   Type createImplFunctionType(
-    Demangle::ImplParameterConvention calleeConvention,
-    ArrayRef<Demangle::ImplFunctionParam<Type>> params,
-    ArrayRef<Demangle::ImplFunctionResult<Type>> results,
-    Optional<Demangle::ImplFunctionResult<Type>> errorResult,
-    ImplFunctionTypeFlags flags);
+      Demangle::ImplParameterConvention calleeConvention,
+      ArrayRef<Demangle::ImplFunctionParam<Type>> params,
+      ArrayRef<Demangle::ImplFunctionResult<Type>> results,
+      llvm::Optional<Demangle::ImplFunctionResult<Type>> errorResult,
+      ImplFunctionTypeFlags flags);
 
   Type createProtocolCompositionType(ArrayRef<ProtocolDecl *> protocols,
                                      Type superclass,
@@ -156,11 +157,13 @@ class ASTBuilder {
   Type createSymbolicExtendedExistentialType(NodePointer shapeNode,
                                              ArrayRef<Type> genArgs);
 
-  Type createExistentialMetatypeType(Type instance,
-                     Optional<Demangle::ImplMetatypeRepresentation> repr=None);
+  Type createExistentialMetatypeType(
+      Type instance,
+      llvm::Optional<Demangle::ImplMetatypeRepresentation> repr = llvm::None);
 
-  Type createMetatypeType(Type instance,
-                     Optional<Demangle::ImplMetatypeRepresentation> repr=None);
+  Type createMetatypeType(
+      Type instance,
+      llvm::Optional<Demangle::ImplMetatypeRepresentation> repr = llvm::None);
 
   Type createGenericTypeParameterType(unsigned depth, unsigned index);
 
@@ -236,8 +239,7 @@ class ASTBuilder {
     SynthesizedByImporter
   };
 
-  Optional<ForeignModuleKind>
-  getForeignModuleKind(NodePointer node);
+  llvm::Optional<ForeignModuleKind> getForeignModuleKind(NodePointer node);
 
   GenericTypeDecl *findTypeDecl(DeclContext *dc,
                                 Identifier name,

include/swift/AST/ASTMangler.h

@@ -13,11 +13,12 @@
 #ifndef SWIFT_AST_ASTMANGLER_H
 #define SWIFT_AST_ASTMANGLER_H
 
-#include "swift/Basic/Mangler.h"
-#include "swift/AST/Types.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/FreestandingMacroExpansion.h"
+#include "swift/AST/Types.h"
+#include "swift/Basic/Mangler.h"
 #include "swift/Basic/TaggedUnion.h"
+#include "llvm/ADT/Optional.h"
 
 namespace clang {
 class NamedDecl;
@@ -251,12 +252,10 @@ class ASTMangler : public Mangler {
   ///
   /// - If `predefined` is true, this mangles the symbol name of the completion handler
   /// predefined in the Swift runtime for the given type signature.
-  std::string mangleObjCAsyncCompletionHandlerImpl(CanSILFunctionType BlockType,
-                                                   CanType ResultType,
-                                                   CanGenericSignature Sig,
-                                                   Optional<bool> FlagParamIsZeroOnError,
-                                                   bool predefined);
-  
+  std::string mangleObjCAsyncCompletionHandlerImpl(
+      CanSILFunctionType BlockType, CanType ResultType, CanGenericSignature Sig,
+      llvm::Optional<bool> FlagParamIsZeroOnError, bool predefined);
+
   /// Mangle the derivative function (JVP/VJP), or optionally its vtable entry
   /// thunk, for the given:
   /// - Mangled original function declaration.
@@ -380,8 +379,8 @@ class ASTMangler : public Mangler {
     ObjCContext,
     ClangImporterContext,
   };
-  
-  static Optional<SpecialContext>
+
+  static llvm::Optional<SpecialContext>
   getSpecialManglingContext(const ValueDecl *decl, bool useObjCProtocolNames);
 
   static bool isCXXCFOptionsDefinition(const ValueDecl *decl);

include/swift/AST/ASTPrinter.h

@@ -133,7 +133,8 @@ class ASTPrinter {
   /// Called before printing of a declaration.
   ///
   /// Callers should use callPrintDeclPre().
-  virtual void printDeclPre(const Decl *D, Optional<BracketOptions> Bracket) {}
+  virtual void printDeclPre(const Decl *D,
+                            llvm::Optional<BracketOptions> Bracket) {}
   /// Called before printing at the point which would be considered the location
   /// of the declaration (normally the name of the declaration).
   ///
@@ -147,7 +148,8 @@ class ASTPrinter {
   /// Called after finishing printing of a declaration.
   ///
   /// Callers should use callPrintDeclPost().
-  virtual void printDeclPost(const Decl *D, Optional<BracketOptions> Bracket) {}
+  virtual void printDeclPost(const Decl *D,
+                             llvm::Optional<BracketOptions> Bracket) {}
 
   /// Called before printing the result type of the declaration. Printer can
   /// replace \p TL to customize the input.
@@ -174,15 +176,15 @@ class ASTPrinter {
   virtual void printModuleRef(ModuleEntity Mod, Identifier Name);
 
   /// Called before printing a synthesized extension.
-  virtual void printSynthesizedExtensionPre(const ExtensionDecl *ED,
-                                            TypeOrExtensionDecl NTD,
-                                            Optional<BracketOptions> Bracket) {}
+  virtual void
+  printSynthesizedExtensionPre(const ExtensionDecl *ED, TypeOrExtensionDecl NTD,
+                               llvm::Optional<BracketOptions> Bracket) {}
 
   /// Called after printing a synthesized extension.
-  virtual void printSynthesizedExtensionPost(const ExtensionDecl *ED,
-                                             TypeOrExtensionDecl TargetDecl,
-                                             Optional<BracketOptions> Bracket) {
-  }
+  virtual void
+  printSynthesizedExtensionPost(const ExtensionDecl *ED,
+                                TypeOrExtensionDecl TargetDecl,
+                                llvm::Optional<BracketOptions> Bracket) {}
 
   /// Called before printing a structured entity.
   ///
@@ -304,10 +306,11 @@ class ASTPrinter {
   // MARK: Callback interface wrappers that perform ASTPrinter bookkeeping.
 
    /// Make a callback to printDeclPre(), performing any necessary bookkeeping.
-  void callPrintDeclPre(const Decl *D, Optional<BracketOptions> Bracket);
+  void callPrintDeclPre(const Decl *D, llvm::Optional<BracketOptions> Bracket);
 
   /// Make a callback to printDeclPost(), performing any necessary bookkeeping.
-  void callPrintDeclPost(const Decl *D, Optional<BracketOptions> Bracket) {
+  void callPrintDeclPost(const Decl *D,
+                         llvm::Optional<BracketOptions> Bracket) {
     printDeclPost(D, Bracket);
   }
 

include/swift/AST/ASTScope.h

@@ -36,6 +36,7 @@
 #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"
@@ -152,7 +153,7 @@ class ASTScopeImpl : public ASTAllocated<ASTScopeImpl> {
   /// Child scopes, sorted by source range.
   Children storedChildren;
 
-  mutable Optional<CharSourceRange> cachedCharSourceRange;
+  mutable llvm::Optional<CharSourceRange> cachedCharSourceRange;
 
 #pragma mark - constructor / destructor
 public:
@@ -922,11 +923,11 @@ class AbstractPatternEntryScope : public ASTScopeImpl {
 
 class PatternEntryDeclScope final : public AbstractPatternEntryScope {
   const bool isLocalBinding;
-  Optional<SourceLoc> endLoc;
+  llvm::Optional<SourceLoc> endLoc;
 
 public:
   PatternEntryDeclScope(PatternBindingDecl *pbDecl, unsigned entryIndex,
-                        bool isLocalBinding, Optional<SourceLoc> endLoc)
+                        bool isLocalBinding, llvm::Optional<SourceLoc> endLoc)
       : AbstractPatternEntryScope(pbDecl, entryIndex),
         isLocalBinding(isLocalBinding), endLoc(endLoc) {}
   virtual ~PatternEntryDeclScope() {}

include/swift/AST/ASTTypeIDZone.def

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

include/swift/AST/ASTTypeIDs.h

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