AST: Refactor unqualified lookup a little bit

Author: slavapestov

include/swift/AST/ASTScope.h

@@ -482,45 +482,33 @@ class Portion : public ASTAllocated<ASTScopeImpl> {
 
   virtual NullablePtr<ASTScopeImpl>
   insertionPointForDeferredExpansion(IterableTypeScope *) const = 0;
-  };
-
-  // For the whole Decl scope of a GenericType or an Extension
-  class GenericTypeOrExtensionWholePortion final : public Portion {
-  public:
-    GenericTypeOrExtensionWholePortion() : Portion("Decl") {}
-    virtual ~GenericTypeOrExtensionWholePortion() {}
-
-    // Just for TypeAlias
-    ASTScopeImpl *expandScope(GenericTypeOrExtensionScope *,
-                              ScopeCreator &) const override;
+};
 
-    SourceRange getChildlessSourceRangeOf(const GenericTypeOrExtensionScope *,
-                                          bool omitAssertions) const override;
+// For the whole Decl scope of a GenericType or an Extension
+class GenericTypeOrExtensionWholePortion final : public Portion {
+public:
+  GenericTypeOrExtensionWholePortion() : Portion("Decl") {}
+  virtual ~GenericTypeOrExtensionWholePortion() {}
 
-    NullablePtr<const ASTScopeImpl>
-    getLookupLimitFor(const GenericTypeOrExtensionScope *) const override;
+  // Just for TypeAlias
+  ASTScopeImpl *expandScope(GenericTypeOrExtensionScope *,
+                            ScopeCreator &) const override;
 
-    NullablePtr<ASTScopeImpl>
-    insertionPointForDeferredExpansion(IterableTypeScope *) const override;
-  };
+  SourceRange getChildlessSourceRangeOf(const GenericTypeOrExtensionScope *,
+                                        bool omitAssertions) const override;
 
-  /// GenericTypeOrExtension = GenericType or Extension
-  class GenericTypeOrExtensionWhereOrBodyPortion : public Portion {
-  public:
-    GenericTypeOrExtensionWhereOrBodyPortion(const char *n) : Portion(n) {}
-    virtual ~GenericTypeOrExtensionWhereOrBodyPortion() {}
+  NullablePtr<const ASTScopeImpl>
+  getLookupLimitFor(const GenericTypeOrExtensionScope *) const override;
 
-    bool lookupMembersOf(const GenericTypeOrExtensionScope *scope,
-                         ASTScopeImpl::DeclConsumer consumer) const override;
+  NullablePtr<ASTScopeImpl>
+  insertionPointForDeferredExpansion(IterableTypeScope *) const override;
 };
 
 /// Behavior specific to representing the trailing where clause of a
 /// GenericTypeDecl or ExtensionDecl scope.
-class GenericTypeOrExtensionWherePortion final
-    : public GenericTypeOrExtensionWhereOrBodyPortion {
+class GenericTypeOrExtensionWherePortion final : public Portion {
 public:
-  GenericTypeOrExtensionWherePortion()
-      : GenericTypeOrExtensionWhereOrBodyPortion("Where") {}
+  GenericTypeOrExtensionWherePortion() : Portion("Where") {}
 
   bool lookupMembersOf(const GenericTypeOrExtensionScope *scope,
                        ASTScopeImpl::DeclConsumer consumer) const override;
@@ -537,11 +525,12 @@ class GenericTypeOrExtensionWherePortion final
 
 /// Behavior specific to representing the Body of a NominalTypeDecl or
 /// ExtensionDecl scope
-class IterableTypeBodyPortion final
-    : public GenericTypeOrExtensionWhereOrBodyPortion {
+class IterableTypeBodyPortion final : public Portion {
 public:
-  IterableTypeBodyPortion()
-      : GenericTypeOrExtensionWhereOrBodyPortion("Body") {}
+  IterableTypeBodyPortion() : Portion("Body") {}
+
+  bool lookupMembersOf(const GenericTypeOrExtensionScope *scope,
+                       ASTScopeImpl::DeclConsumer consumer) const override;
 
   ASTScopeImpl *expandScope(GenericTypeOrExtensionScope *,
                             ScopeCreator &) const override;

lib/AST/ASTScopeLookup.cpp

@@ -274,22 +274,24 @@ bool Portion::lookupMembersOf(const GenericTypeOrExtensionScope *,
   return false;
 }
 
-bool GenericTypeOrExtensionWhereOrBodyPortion::lookupMembersOf(
+bool GenericTypeOrExtensionWherePortion::lookupMembersOf(
     const GenericTypeOrExtensionScope *scope,
     ASTScopeImpl::DeclConsumer consumer) const {
   if (scope->getCorrespondingNominalTypeDecl().isNull())
     return false;
+
+  if (!scope->areMembersVisibleFromWhereClause())
+    return false;
+
   return consumer.lookInMembers(scope->getGenericContext());
 }
 
-bool GenericTypeOrExtensionWherePortion::lookupMembersOf(
+bool IterableTypeBodyPortion::lookupMembersOf(
     const GenericTypeOrExtensionScope *scope,
     ASTScopeImpl::DeclConsumer consumer) const {
-  if (!scope->areMembersVisibleFromWhereClause())
+  if (scope->getCorrespondingNominalTypeDecl().isNull())
     return false;
-
-  return GenericTypeOrExtensionWhereOrBodyPortion::lookupMembersOf(
-    scope, consumer);
+  return consumer.lookInMembers(scope->getGenericContext());
 }
 
 bool GenericTypeOrExtensionScope::areMembersVisibleFromWhereClause() const {