Remove NLOptions::NL_Known*

Author: CodaFi

include/swift/AST/LookupKinds.h

@@ -31,53 +31,24 @@ void simple_display(llvm::raw_ostream &out, NLKind kind);
 /// Constants used to customize name lookup.
 enum NLOptions : unsigned {
   /// Consider declarations within protocols to which the context type conforms.
-  NL_ProtocolMembers = 0x02,
+  NL_ProtocolMembers = 1 << 0,
 
   /// Remove non-visible declarations from the set of results.
-  NL_RemoveNonVisible = 0x04,
+  NL_RemoveNonVisible = 1 << 1,
 
   /// Remove overridden declarations from the set of results.
-  NL_RemoveOverridden = 0x08,
+  NL_RemoveOverridden = 1 << 2,
 
   /// Don't check access when doing lookup into a type.
   ///
   /// This option is not valid when performing lookup into a module.
-  NL_IgnoreAccessControl = 0x10,
-
-  /// This lookup is known to be a non-cascading dependency, i.e. one that does
-  /// not affect downstream files.
-  ///
-  /// \see NL_KnownDependencyMask
-  NL_KnownNonCascadingDependency = 0x20,
-
-  /// This lookup is known to be a cascading dependency, i.e. one that can
-  /// affect downstream files.
-  ///
-  /// \see NL_KnownDependencyMask
-  NL_KnownCascadingDependency = 0x40,
+  NL_IgnoreAccessControl = 1 << 3,
 
   /// This lookup should only return type declarations.
-  NL_OnlyTypes = 0x80,
+  NL_OnlyTypes = 1 << 4,
 
   /// Include synonyms declared with @_implements()
-  NL_IncludeAttributeImplements = 0x100,
-
-  /// This lookup is known to not add any additional dependencies to the
-  /// primary source file.
-  ///
-  /// \see NL_KnownDependencyMask
-  NL_KnownNoDependency =
-      NL_KnownNonCascadingDependency|NL_KnownCascadingDependency,
-
-  /// A mask of all options controlling how a lookup should be recorded as a
-  /// dependency.
-  ///
-  /// This offers three possible options: NL_KnownNonCascadingDependency,
-  /// NL_KnownCascadingDependency, NL_KnownNoDependency, as well as a default
-  /// "unspecified" value (0). If the dependency kind is unspecified, the
-  /// lookup function will attempt to infer whether it is a cascading or
-  /// non-cascading dependency from the decl context.
-  NL_KnownDependencyMask = NL_KnownNoDependency,
+  NL_IncludeAttributeImplements = 1 << 5,
 
   /// The default set of options used for qualified name lookup.
   ///

lib/AST/NameLookup.cpp

@@ -2796,8 +2796,6 @@ void swift::simple_display(llvm::raw_ostream &out, NLOptions options) {
     FLAG(NL_RemoveNonVisible)
     FLAG(NL_RemoveOverridden)
     FLAG(NL_IgnoreAccessControl)
-    FLAG(NL_KnownNonCascadingDependency)
-    FLAG(NL_KnownCascadingDependency)
     FLAG(NL_OnlyTypes)
     FLAG(NL_IncludeAttributeImplements)
 #undef FLAG

lib/AST/NameLookupRequests.cpp

@@ -376,13 +376,11 @@ evaluator::DependencySource ModuleQualifiedLookupRequest::readDependencySource(
   // FIXME(Evaluator Incremental Dependencies): This is an artifact of the
   // current scheme and should be removed. There are very few callers that are
   // accurately passing the right known dependencies mask.
-  const bool knownPrivate =
-      (options & NL_KnownDependencyMask) == NL_KnownNonCascadingDependency;
   const bool fromPrivateDC =
       DC->isCascadingContextForLookup(/*functionsAreNonCascading=*/false);
 
   auto scope = evaluator::DependencyScope::Cascading;
-  if (knownPrivate || fromPrivateDC)
+  if (fromPrivateDC)
     scope = evaluator::DependencyScope::Private;
   return { DC->getParentSourceFile(), scope };
 }
@@ -461,10 +459,8 @@ evaluator::DependencySource QualifiedLookupRequest::readDependencySource(
   // accurately passing the right known dependencies mask.
   const bool cascades =
       dc->isCascadingContextForLookup(/*functionsAreNonCascading*/ false);
-  const bool knownPrivate =
-      (opts & NL_KnownDependencyMask) == NL_KnownNonCascadingDependency;
   auto scope = evaluator::DependencyScope::Cascading;
-  if (!cascades || knownPrivate)
+  if (!cascades)
     scope = evaluator::DependencyScope::Private;
   return {
     dyn_cast<SourceFile>(dc->getModuleScopeContext()),

lib/AST/UnqualifiedLookup.cpp

@@ -363,12 +363,9 @@ void UnqualifiedLookupFactory::ResultFinderForTypeContext::findResults(
   // An optimization:
   if (selfBounds.empty())
     return;
-  const NLOptions options =
-      baseNLOptions | (isCascadingUse ? NL_KnownCascadingDependency
-                                      : NL_KnownNonCascadingDependency);
 
   SmallVector<ValueDecl *, 4> Lookup;
-  contextForLookup->lookupQualified(selfBounds, Name, options, Lookup);
+  contextForLookup->lookupQualified(selfBounds, Name, baseNLOptions, Lookup);
   for (auto Result : Lookup) {
     results.push_back(LookupResultEntry(whereValueIsMember(Result), Result));
 #ifndef NDEBUG

lib/ClangImporter/ImportDecl.cpp

@@ -6574,7 +6574,7 @@ void SwiftDeclConverter::recordObjCOverride(AbstractFunctionDecl *decl) {
   // Dig out the Objective-C superclass.
   SmallVector<ValueDecl *, 4> results;
   superDecl->lookupQualified(superDecl, DeclNameRef(decl->getName()),
-                             NL_QualifiedDefault | NL_KnownNoDependency,
+                             NL_QualifiedDefault,
                              results);
   for (auto member : results) {
     if (member->getKind() != decl->getKind() ||
@@ -6647,7 +6647,7 @@ void SwiftDeclConverter::recordObjCOverride(SubscriptDecl *subscript) {
   SmallVector<ValueDecl *, 2> lookup;
   subscript->getModuleContext()->lookupQualified(
       superDecl, DeclNameRef(subscript->getName()),
-      NL_QualifiedDefault | NL_KnownNoDependency, lookup);
+      NL_QualifiedDefault, lookup);
 
   for (auto result : lookup) {
     auto parentSub = dyn_cast<SubscriptDecl>(result);

lib/SIL/IR/SILFunctionType.cpp

@@ -931,8 +931,7 @@ static CanType getKnownType(Optional<CanType> &cacheSlot, ASTContext &C,
       // themselves.
       SmallVector<ValueDecl *, 2> decls;
       mod->lookupQualified(mod, DeclNameRef(C.getIdentifier(typeName)),
-                           NL_QualifiedDefault | NL_KnownNonCascadingDependency,
-                           decls);
+                           NL_QualifiedDefault, decls);
       if (decls.size() != 1)
         return CanType();
 

lib/Sema/TypeCheckStmt.cpp

@@ -1657,7 +1657,7 @@ static bool checkSuperInit(ConstructorDecl *fromCtor,
     superclassDecl->synthesizeSemanticMembersIfNeeded(
         DeclBaseName::createConstructor());
 
-    NLOptions subOptions = NL_QualifiedDefault | NL_KnownNonCascadingDependency;
+    NLOptions subOptions = NL_QualifiedDefault;
 
     SmallVector<ValueDecl *, 4> lookupResults;
     fromCtor->lookupQualified(superclassDecl,

lib/Serialization/Deserialization.cpp

@@ -1322,7 +1322,7 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
                                getIdentifier(privateDiscriminator));
     } else {
       baseModule->lookupQualified(baseModule, DeclNameRef(name),
-                                  NL_QualifiedDefault | NL_KnownNoDependency,
+                                  NL_QualifiedDefault,
                                   values);
     }
     filterValues(filterTy, nullptr, nullptr, isType, inProtocolExt,

lib/Serialization/ModuleFile.cpp

@@ -486,7 +486,7 @@ void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {
           SmallVector<ValueDecl *, 8> Decls;
           TopLevelModule->lookupQualified(
               TopLevelModule, DeclNameRef(ScopeID),
-              NL_QualifiedDefault | NL_KnownNoDependency, Decls);
+              NL_QualifiedDefault, Decls);
           Optional<ImportKind> FoundKind = ImportDecl::findBestImportKind(Decls);
           assert(FoundKind.hasValue() &&
                  "deserialized imports should not be ambiguous");