From a7259558238eadd1c69a234baef1b67ab45f8492 Mon Sep 17 00:00:00 2001
From: Arnold Schwaighofer <aschwaighofer@apple.com>
Date: Wed, 14 Oct 2020 13:10:19 -0700
Subject: [PATCH] More renaming

---
 lib/AST/ModuleNameLookup.cpp  | 5 +++--
 lib/AST/NameLookup.cpp        | 5 +++--
 lib/Sema/TypeCheckDecl.cpp    | 4 ++--
 lib/Sema/TypeCheckGeneric.cpp | 2 +-
 lib/Sema/TypeCheckType.cpp    | 4 ++--
 lib/Sema/TypeCheckType.h      | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/AST/ModuleNameLookup.cpp b/lib/AST/ModuleNameLookup.cpp
index 4fbe9313bdbff..22674d560f0ba 100644
--- a/lib/AST/ModuleNameLookup.cpp
+++ b/lib/AST/ModuleNameLookup.cpp
@@ -145,7 +145,7 @@ void ModuleNameLookup<LookupStrategy>::lookupInModule(
 
   const size_t initialCount = decls.size();
   size_t currentCount = decls.size();
-  bool includeInlineable = options & NL_IncludeUsableFromInline;
+  bool includeUsableFromInline = options & NL_IncludeUsableFromInline;
 
   auto updateNewDecls = [&](const DeclContext *moduleScopeContext) {
     if (decls.size() == currentCount)
@@ -157,7 +157,8 @@ void ModuleNameLookup<LookupStrategy>::lookupInModule(
         if (resolutionKind == ResolutionKind::TypesOnly && !isa<TypeDecl>(VD))
           return true;
         if (respectAccessControl &&
-            !VD->isAccessibleFrom(moduleScopeContext, false, includeInlineable))
+            !VD->isAccessibleFrom(moduleScopeContext, false,
+                                  includeUsableFromInline))
           return true;
         return false;
       });
diff --git a/lib/AST/NameLookup.cpp b/lib/AST/NameLookup.cpp
index e7fd2f65cb5b4..bc323187263f9 100644
--- a/lib/AST/NameLookup.cpp
+++ b/lib/AST/NameLookup.cpp
@@ -1502,8 +1502,9 @@ static bool isAcceptableLookupResult(const DeclContext *dc,
   // Check access.
   if (!(options & NL_IgnoreAccessControl) &&
       !dc->getASTContext().isAccessControlDisabled()) {
-    bool allowInlinable = options & NL_IncludeUsableFromInline;
-    return decl->isAccessibleFrom(dc, /*forConformance*/ false, allowInlinable);
+    bool allowUsableFromInline = options & NL_IncludeUsableFromInline;
+    return decl->isAccessibleFrom(dc, /*forConformance*/ false,
+                                  allowUsableFromInline);
   }
 
   return true;
diff --git a/lib/Sema/TypeCheckDecl.cpp b/lib/Sema/TypeCheckDecl.cpp
index bf400f54c9e32..d0ac96b22ea22 100644
--- a/lib/Sema/TypeCheckDecl.cpp
+++ b/lib/Sema/TypeCheckDecl.cpp
@@ -2190,7 +2190,7 @@ static Type validateParameterType(ParamDecl *decl) {
   options |= TypeResolutionFlags::Direct;
 
   if (dc->isInSpecializeExtensionContext())
-    options |= TypeResolutionFlags::AllowInlinable;
+    options |= TypeResolutionFlags::AllowUsableFromInline;
 
   const auto resolution =
       TypeResolution::forInterface(dc, options, unboundTyOpener);
@@ -2727,7 +2727,7 @@ ExtendedTypeRequest::evaluate(Evaluator &eval, ExtensionDecl *ext) const {
   // Compute the extended type.
   TypeResolutionOptions options(TypeResolverContext::ExtensionBinding);
   if (ext->isInSpecializeExtensionContext())
-    options |= TypeResolutionFlags::AllowInlinable;
+    options |= TypeResolutionFlags::AllowUsableFromInline;
   const auto resolution = TypeResolution::forStructural(
       ext->getDeclContext(), options,
       [](auto unboundTy) {
diff --git a/lib/Sema/TypeCheckGeneric.cpp b/lib/Sema/TypeCheckGeneric.cpp
index da60f36c5b31a..fb07113c6c560 100644
--- a/lib/Sema/TypeCheckGeneric.cpp
+++ b/lib/Sema/TypeCheckGeneric.cpp
@@ -905,7 +905,7 @@ RequirementRequest::evaluate(Evaluator &evaluator,
   // Figure out the type resolution.
   auto options = TypeResolutionOptions(TypeResolverContext::GenericRequirement);
   if (owner.dc->isInSpecializeExtensionContext())
-    options |= TypeResolutionFlags::AllowInlinable;
+    options |= TypeResolutionFlags::AllowUsableFromInline;
   Optional<TypeResolution> resolution;
   switch (stage) {
   case TypeResolutionStage::Structural:
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
index da26ab89a5b9b..f6376064dee61 100644
--- a/lib/Sema/TypeCheckType.cpp
+++ b/lib/Sema/TypeCheckType.cpp
@@ -1322,7 +1322,7 @@ static Type resolveTopLevelIdentTypeComponent(TypeResolution resolution,
   }
 
   NameLookupOptions lookupOptions = defaultUnqualifiedLookupOptions;
-  if (options.contains(TypeResolutionFlags::AllowInlinable))
+  if (options.contains(TypeResolutionFlags::AllowUsableFromInline))
     lookupOptions |= NameLookupFlags::IncludeUsableFromInline;
   auto globals = TypeChecker::lookupUnqualifiedType(DC, id, comp->getLoc(),
                                                     lookupOptions);
@@ -1526,7 +1526,7 @@ static Type resolveNestedIdentTypeComponent(TypeResolution resolution,
 
   // Look for member types with the given name.
   NameLookupOptions lookupOptions = defaultMemberLookupOptions;
-  if (options.contains(TypeResolutionFlags::AllowInlinable))
+  if (options.contains(TypeResolutionFlags::AllowUsableFromInline))
     lookupOptions |= NameLookupFlags::IncludeUsableFromInline;
   LookupTypeResult memberTypes;
   if (parentTy->mayHaveMembers())
diff --git a/lib/Sema/TypeCheckType.h b/lib/Sema/TypeCheckType.h
index 098e9fd1e31bd..dcc7d7f4ae37b 100644
--- a/lib/Sema/TypeCheckType.h
+++ b/lib/Sema/TypeCheckType.h
@@ -66,7 +66,7 @@ enum class TypeResolutionFlags : uint16_t {
   AllowModule = 1 << 9,
 
   /// Make internal @usableFromInline and @inlinable decls visible.
-  AllowInlinable = 1 << 10,
+  AllowUsableFromInline = 1 << 10,
 };
 
 /// Type resolution contexts that require special handling.