Move OptionSet to its own namespace

The type was colliding with the `OptionSet` type in the Swift stdlib when using Swift from C++.

Author: ahoppen

include/swift/AST/CaptureInfo.h

@@ -33,6 +33,7 @@ template <> struct DenseMapInfo<swift::CapturedValue>;
 }
 
 namespace swift {
+using namespace swift::optionset;
 class ValueDecl;
 class FuncDecl;
 class OpaqueValueExpr;
@@ -146,7 +147,7 @@ class CaptureInfo {
     HasGenericParamCaptures = 1 << 0
   };
 
-  llvm::PointerIntPair<const CaptureInfoStorage *, 2, OptionSet<Flags>>
+  llvm::PointerIntPair<const CaptureInfoStorage *, 2, optionset::OptionSet<Flags>>
       StorageAndFlags;
 
 public:

include/swift/AST/Decl.h

@@ -60,6 +60,7 @@ class PointerAuthQualifier;
 } // end namespace clang
 
 namespace swift {
+  using namespace swift::optionset;
   enum class AccessSemantics : unsigned char;
   class AccessorDecl;
   class ApplyExpr;

include/swift/AST/Effects.h

@@ -42,7 +42,7 @@ enum class EffectKind : uint8_t {
   Throws = 1 << 0,
   Async  = 1 << 1
 };
-using PossibleEffects = OptionSet<EffectKind>;
+using PossibleEffects = optionset::OptionSet<EffectKind>;
 
 void simple_display(llvm::raw_ostream &out, const EffectKind kind);
 

include/swift/AST/FileUnit.h

@@ -65,7 +65,7 @@ class FileUnit : public DeclContext, public ASTAllocated<FileUnit> {
   ///
   /// This does a simple local lookup, not recursively looking through imports.
   virtual void lookupValue(DeclName name, NLKind lookupKind,
-                           OptionSet<ModuleLookupFlags> Flags,
+                           optionset::OptionSet<ModuleLookupFlags> Flags,
                            SmallVectorImpl<ValueDecl*> &result) const = 0;
 
   /// Look up a local type declaration by its mangled name.
@@ -384,7 +384,7 @@ class BuiltinUnit final : public FileUnit {
   explicit BuiltinUnit(ModuleDecl &M);
 
   virtual void lookupValue(DeclName name, NLKind lookupKind,
-                           OptionSet<ModuleLookupFlags> Flags,
+                           optionset::OptionSet<ModuleLookupFlags> Flags,
                            SmallVectorImpl<ValueDecl*> &result) const override;
 
   /// Find all Objective-C methods with the given selector.

include/swift/AST/GenericSignature.h

@@ -581,7 +581,7 @@ enum class GenericSignatureErrorFlags {
   CompletionFailed = (1<<2)
 };
 
-using GenericSignatureErrors = OptionSet<GenericSignatureErrorFlags>;
+using GenericSignatureErrors = optionset::OptionSet<GenericSignatureErrorFlags>;
 
 /// AbstractGenericSignatureRequest and InferredGenericSignatureRequest
 /// return this type, which stores a GenericSignature together with the

include/swift/AST/IRGenOptions.h

@@ -35,6 +35,7 @@
 #include <vector>
 
 namespace swift {
+using namespace swift::optionset;
 
 enum class IRGenOutputKind : unsigned {
   /// Just generate an LLVM module and return it.
@@ -265,10 +266,10 @@ class IRGenOptions {
   OptimizationMode OptMode;
 
   /// Which sanitizer is turned on.
-  OptionSet<SanitizerKind> Sanitizers;
+  optionset::OptionSet<SanitizerKind> Sanitizers;
 
   /// Which sanitizer(s) have recovery instrumentation enabled.
-  OptionSet<SanitizerKind> SanitizersWithRecoveryInstrumentation;
+  optionset::OptionSet<SanitizerKind> SanitizersWithRecoveryInstrumentation;
 
   /// Whether to enable ODR indicators when building with ASan.
   unsigned SanitizeAddressUseODRIndicator : 1;
@@ -514,8 +515,8 @@ class IRGenOptions {
   IRGenOptions()
       : OutputKind(IRGenOutputKind::LLVMAssemblyAfterOptimization),
         Verify(true), OptMode(OptimizationMode::NotSet),
-        Sanitizers(OptionSet<SanitizerKind>()),
-        SanitizersWithRecoveryInstrumentation(OptionSet<SanitizerKind>()),
+        Sanitizers(optionset::OptionSet<SanitizerKind>()),
+        SanitizersWithRecoveryInstrumentation(optionset::OptionSet<SanitizerKind>()),
         SanitizeAddressUseODRIndicator(false),
         DebugInfoLevel(IRGenDebugInfoLevel::None),
         DebugInfoFormat(IRGenDebugInfoFormat::None),

include/swift/AST/Import.h

@@ -35,6 +35,7 @@
 #include <algorithm>
 
 namespace swift {
+using namespace swift::optionset;
 class ASTContext;
 class ModuleDecl;
 
@@ -99,7 +100,7 @@ enum class ImportFlags {
 };
 
 /// \see ImportFlags
-using ImportOptions = OptionSet<ImportFlags>;
+using ImportOptions = optionset::OptionSet<ImportFlags>;
 
 void simple_display(llvm::raw_ostream &out, ImportOptions options);
 

include/swift/AST/MacroDeclaration.h

@@ -69,7 +69,7 @@ enum class MacroRole: uint32_t {
 std::vector<MacroRole> getAllMacroRoles();
 
 /// The contexts in which a particular macro declaration can be used.
-using MacroRoles = OptionSet<MacroRole>;
+using MacroRoles = optionset::OptionSet<MacroRole>;
 
 void simple_display(llvm::raw_ostream &out, MacroRoles roles);
 bool operator==(MacroRoles lhs, MacroRoles rhs);

include/swift/AST/Module.h

@@ -322,7 +322,7 @@ class ModuleDecl
       DiagnosedMultipleMainClasses = 1 << 0,
       DiagnosedMainClassWithScript = 1 << 1
     };
-    llvm::PointerIntPair<FileUnit *, 2, OptionSet<Flags>> storage;
+    llvm::PointerIntPair<FileUnit *, 2, optionset::OptionSet<Flags>> storage;
   public:
     EntryPointInfoTy() = default;
 
@@ -757,7 +757,7 @@ class ModuleDecl
   ///
   /// This does a simple local lookup, not recursively looking through imports.
   void lookupValue(DeclName Name, NLKind LookupKind,
-                   OptionSet<ModuleLookupFlags> Flags,
+                   optionset::OptionSet<ModuleLookupFlags> Flags,
                    SmallVectorImpl<ValueDecl*> &Result) const;
 
   /// Look up a (possibly overloaded) value set at top-level scope
@@ -907,7 +907,7 @@ class ModuleDecl
     ShadowedByCrossImportOverlay = 1 << 6
   };
   /// \sa getImportedModules
-  using ImportFilter = OptionSet<ImportFilterKind>;
+  using ImportFilter = optionset::OptionSet<ImportFilterKind>;
 
   /// Returns an \c ImportFilter with all elements of \c ImportFilterKind.
   constexpr static ImportFilter getImportFilterAll() {

include/swift/AST/NameLookup.h

@@ -247,7 +247,7 @@ enum class UnqualifiedLookupFlags {
   MacroLookup            = 1 << 7,
 };
 
-using UnqualifiedLookupOptions = OptionSet<UnqualifiedLookupFlags>;
+using UnqualifiedLookupOptions = optionset::OptionSet<UnqualifiedLookupFlags>;
 
 void simple_display(llvm::raw_ostream &out, UnqualifiedLookupOptions options);
 

include/swift/AST/NameLookupRequests.h

@@ -390,7 +390,7 @@ class GenericParamListRequest :
 
 /// The input type for an unqualified lookup request.
 class UnqualifiedLookupDescriptor {
-  using LookupOptions = OptionSet<UnqualifiedLookupFlags>;
+  using LookupOptions = optionset::OptionSet<UnqualifiedLookupFlags>;
 
 public:
   DeclNameRef Name;
@@ -552,7 +552,7 @@ class QualifiedLookupRequest
 
 /// The input type for a direct lookup request.
 class DirectLookupDescriptor final {
-  using LookupOptions = OptionSet<NominalTypeDecl::LookupDirectFlags>;
+  using LookupOptions = optionset::OptionSet<NominalTypeDecl::LookupDirectFlags>;
 
 public:
   NominalTypeDecl *DC;

include/swift/AST/ParameterList.h

@@ -123,14 +123,14 @@ class alignas(ParamDecl *) ParameterList final :
     NamedArguments = 0x04,
   };
 
-  friend OptionSet<CloneFlags> operator|(CloneFlags flag1, CloneFlags flag2) {
-    return OptionSet<CloneFlags>(flag1) | flag2;
+  friend optionset::OptionSet<CloneFlags> operator|(CloneFlags flag1, CloneFlags flag2) {
+    return optionset::OptionSet<CloneFlags>(flag1) | flag2;
   }
 
   /// Make a duplicate copy of this parameter list.  This allocates copies of
   /// the ParamDecls, so they can be reparented into a new DeclContext.
   ParameterList *clone(const ASTContext &C,
-                       OptionSet<CloneFlags> options = llvm::None) const;
+                       optionset::OptionSet<CloneFlags> options = llvm::None) const;
 
   /// Return a list of function parameters for this parameter list,
   /// based on the interface types of the parameters in this list.

include/swift/AST/SILOptions.h

@@ -245,7 +245,7 @@ class SILOptions {
   bool IgnoreAlwaysInline = false;
 
   /// Indicates which sanitizer is turned on.
-  OptionSet<SanitizerKind> Sanitizers;
+  optionset::OptionSet<SanitizerKind> Sanitizers;
 
   /// Emit compile-time diagnostics when the law of exclusivity is violated.
   bool EnforceExclusivityStatic = true;

include/swift/AST/SourceFile.h

@@ -97,7 +97,7 @@ class SourceFile final : public FileUnit {
     /// Validate the new SwiftSyntax parser diagnostics.
     ValidateNewParserDiagnostics = 1 << 6,
   };
-  using ParsingOptions = OptionSet<ParsingFlags>;
+  using ParsingOptions = optionset::OptionSet<ParsingFlags>;
 
   /// Retrieve the parsing options specified in the LangOptions.
   static ParsingOptions getDefaultParsingOptions(const LangOptions &langOpts);
@@ -455,7 +455,7 @@ class SourceFile final : public FileUnit {
   const SmallVectorImpl<ValueDecl *> &getCachedVisibleDecls() const;
 
   virtual void lookupValue(DeclName name, NLKind lookupKind,
-                           OptionSet<ModuleLookupFlags> Flags,
+                           optionset::OptionSet<ModuleLookupFlags> Flags,
                            SmallVectorImpl<ValueDecl*> &result) const override;
 
   virtual void lookupVisibleDecls(ImportPath::Access accessPath,

include/swift/AST/SynthesizedFileUnit.h

@@ -44,7 +44,7 @@ class SynthesizedFileUnit final : public FileUnit {
   void addTopLevelDecl(Decl *D) { TopLevelDecls.push_back(D); }
 
   virtual void lookupValue(DeclName name, NLKind lookupKind,
-                           OptionSet<ModuleLookupFlags> Flags,
+                           optionset::OptionSet<ModuleLookupFlags> Flags,
                            SmallVectorImpl<ValueDecl *> &result) const override;
 
   void lookupObjCMethods(

include/swift/AST/Type.h

@@ -38,6 +38,7 @@
 
 namespace swift {
 
+using namespace swift::optionset;
 class ASTPrinter;
 class ArchetypeType;
 class ClassDecl;
@@ -160,7 +161,7 @@ enum class SubstFlags {
 };
 
 /// Options for performing substitutions into a type.
-struct SubstOptions : public OptionSet<SubstFlags> {
+struct SubstOptions : public optionset::OptionSet<SubstFlags> {
   // Note: The unfortunate use of TypeBase * here, rather than Type,
   // is due to a libc++ quirk that requires the result type to be
   // complete.
@@ -176,7 +177,7 @@ struct SubstOptions : public OptionSet<SubstFlags> {
 
   SubstOptions(SubstFlags flags) : OptionSet(flags) { }
 
-  SubstOptions(OptionSet<SubstFlags> options) : OptionSet(options) { }
+  SubstOptions(optionset::OptionSet<SubstFlags> options) : OptionSet(options) { }
 };
 
 inline SubstOptions operator|(SubstFlags lhs, SubstFlags rhs) {

include/swift/AST/Types.h

@@ -55,6 +55,7 @@ struct fltSemantics;
 
 namespace swift {
 
+using namespace swift::optionset;
 enum class AllocationArena;
 class ArchetypeType;
 class ArgumentList;

include/swift/Basic/OptionSet.h

@@ -24,6 +24,7 @@
 #include <initializer_list>
 
 namespace swift {
+namespace optionset {
 
 /// The class template \c OptionSet captures a set of options stored as the
 /// bits in an unsigned integral value.
@@ -151,7 +152,7 @@ class OptionSet {
                               Flags>::value,
                 "operator| should produce an OptionSet");
 };
-
+} // end namespace optionset
 } // end namespace swift
 
 #endif // SWIFT_BASIC_OPTIONSET_H

include/swift/Basic/StringExtras.h

@@ -31,6 +31,8 @@
 #include <string>
 
 namespace swift {
+using namespace swift::optionset;
+
   /// Determine whether the given string can be an argument label.
   ///
   /// \seealso Token::canBeArgumentLabel()
@@ -335,7 +337,7 @@ enum class OmissionTypeFlags {
 };
 
 /// Options that described omitted types.
-using OmissionTypeOptions = OptionSet<OmissionTypeFlags>;
+using OmissionTypeOptions = optionset::OptionSet<OmissionTypeFlags>;
 
 /// Describes the name of a type as is used for omitting needless
 /// words.

include/swift/ClangImporter/ClangModule.h

@@ -66,7 +66,7 @@ class ClangModuleUnit final : public LoadedFile {
   virtual bool isSystemModule() const override;
 
   virtual void lookupValue(DeclName name, NLKind lookupKind,
-                           OptionSet<ModuleLookupFlags> Flags,
+                           optionset::OptionSet<ModuleLookupFlags> Flags,
                            SmallVectorImpl<ValueDecl*> &results) const override;
 
   virtual TypeDecl *

include/swift/Driver/Driver.h

@@ -151,7 +151,7 @@ class OutputInfo {
   /// (If empty, this implies no SDK.)
   std::string SDKPath;
 
-  OptionSet<SanitizerKind> SelectedSanitizers;
+  optionset::OptionSet<SanitizerKind> SelectedSanitizers;
 
   /// Might this sort of compile have explicit primary inputs?
   /// When running a single compile for the whole module (in other words

include/swift/IDE/CodeCompletionResult.h

@@ -89,7 +89,7 @@ enum class CodeCompletionFlairBit : uint8_t {
   ExpressionAtNonScriptOrMainFileScope = 1 << 6,
 };
 
-using CodeCompletionFlair = OptionSet<CodeCompletionFlairBit>;
+using CodeCompletionFlair = optionset::OptionSet<CodeCompletionFlairBit>;
 
 /// The declaration kind of a code completion result, if it is a declaration.
 enum class CodeCompletionDeclKind : uint8_t {
@@ -327,7 +327,7 @@ enum class CodeCompletionMacroRole : uint8_t {
   AttachedContext = 1 << 4,
   AttachedDecl = 1 << 5,
 };
-using CodeCompletionMacroRoles = OptionSet<CodeCompletionMacroRole>;
+using CodeCompletionMacroRoles = optionset::OptionSet<CodeCompletionMacroRole>;
 
 enum class CodeCompletionFilterFlag : uint16_t {
   Expr = 1 << 0,
@@ -341,12 +341,12 @@ enum class CodeCompletionFilterFlag : uint16_t {
   AttachedContextMacro = 1 << 8,
   AttachedDeclMacro = 1 << 9,
 };
-using CodeCompletionFilter = OptionSet<CodeCompletionFilterFlag>;
+using CodeCompletionFilter = optionset::OptionSet<CodeCompletionFilterFlag>;
 
 CodeCompletionMacroRoles getCompletionMacroRoles(const Decl *D);
 
 CodeCompletionMacroRoles
-getCompletionMacroRoles(OptionSet<CustomAttributeKind> kinds);
+getCompletionMacroRoles(optionset::OptionSet<CustomAttributeKind> kinds);
 
 CodeCompletionMacroRoles getCompletionMacroRoles(CodeCompletionFilter filter);
 

include/swift/IDE/CodeCompletionResultType.h

@@ -21,6 +21,8 @@
 namespace swift {
 namespace ide {
 
+using namespace swift::optionset;
+
 enum class CustomAttributeKind : uint8_t {
   /// A type that can be used as a property wrapper.
   PropertyWrapper = 1 << 0,

include/swift/IDE/CompletionLookup.h

@@ -236,7 +236,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
   void setExpectedTypes(
       ArrayRef<Type> Types, bool isImplicitSingleExpressionReturn,
       bool preferNonVoid = false,
-      OptionSet<CustomAttributeKind> expectedCustomAttributeKinds = {}) {
+                        optionset::OptionSet<CustomAttributeKind> expectedCustomAttributeKinds = {}) {
     expectedTypeContext.setIsImplicitSingleExpressionReturn(
         isImplicitSingleExpressionReturn);
     expectedTypeContext.setPreferNonVoid(preferNonVoid);

include/swift/IDE/ModuleInterfacePrinting.h

@@ -46,7 +46,7 @@ enum class ModuleTraversal : unsigned {
 };
 
 /// Options used to describe the traversal of a module for printing.
-using ModuleTraversalOptions = OptionSet<ModuleTraversal>;
+using ModuleTraversalOptions = optionset::OptionSet<ModuleTraversal>;
 
 void collectModuleGroups(ModuleDecl *M, SmallVectorImpl<StringRef> &Into);
 

include/swift/Option/SanitizerOptions.h

@@ -23,6 +23,7 @@
 #include "llvm/Transforms/Instrumentation.h"
 
 namespace swift {
+using namespace swift::optionset;
 class DiagnosticEngine;
 
 /// Parses a -sanitize= argument's values.

include/swift/Parse/Parser.h

@@ -951,7 +951,7 @@ class Parser {
   };
 
   /// Options that control the parsing of declarations.
-  using ParseDeclOptions = OptionSet<ParseDeclFlags>;
+  using ParseDeclOptions = optionset::OptionSet<ParseDeclFlags>;
 
   void consumeDecl(ParserPosition BeginParserPosition, ParseDeclOptions Flags,
                    bool IsTopLevel);
@@ -1804,7 +1804,7 @@ class Parser {
     /// backwards compatibility.
     AllowLowercaseAndUppercaseSelf = 1 << 6,
   };
-  using DeclNameOptions = OptionSet<DeclNameFlag>;
+  using DeclNameOptions = optionset::OptionSet<DeclNameFlag>;
 
   friend DeclNameOptions operator|(DeclNameFlag flag1, DeclNameFlag flag2) {
     return DeclNameOptions(flag1) | flag2;