Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

include/swift/AST/ASTScope.h

@@ -715,6 +715,10 @@ class GenericTypeOrExtensionWherePortion final
   GenericTypeOrExtensionWherePortion()
       : GenericTypeOrExtensionWhereOrBodyPortion("Where") {}
 
+  bool lookupMembersOf(const GenericTypeOrExtensionScope *scope,
+                       ArrayRef<const ASTScopeImpl *>,
+                       ASTScopeImpl::DeclConsumer consumer) const override;
+
   ASTScopeImpl *expandScope(GenericTypeOrExtensionScope *,
                             ScopeCreator &) const override;
 
@@ -815,6 +819,8 @@ class GenericTypeOrExtensionScope : public ASTScopeImpl {
     return nullptr;
   }
 
+  bool areMembersVisibleFromWhereClause() const;
+
   virtual void createBodyScope(ASTScopeImpl *leaf, ScopeCreator &) {}
 
 protected:

include/swift/AST/Decl.h

@@ -1190,9 +1190,6 @@ class GenericParamList final :
 
   GenericParamList *OuterParameters;
 
-  SourceLoc TrailingWhereLoc;
-  unsigned FirstTrailingWhereArg;
-
   GenericParamList(SourceLoc LAngleLoc,
                    ArrayRef<GenericTypeParamDecl *> Params,
                    SourceLoc WhereLoc,
@@ -1272,31 +1269,6 @@ class GenericParamList final :
   /// implicitly-generated requirements, and may be non-empty even if no
   /// 'where' keyword is present.
   ArrayRef<RequirementRepr> getRequirements() const { return Requirements; }
-
-  /// Retrieve only those requirements that are written within the brackets,
-  /// which does not include any requirements written in a trailing where
-  /// clause.
-  ArrayRef<RequirementRepr> getNonTrailingRequirements() const {
-    return Requirements.slice(0, FirstTrailingWhereArg);
-  }
-
-  /// Retrieve only those requirements written in a trailing where
-  /// clause.
-  ArrayRef<RequirementRepr> getTrailingRequirements() const {
-    return Requirements.slice(FirstTrailingWhereArg);
-  }
-
-  /// Determine whether the generic parameters have a trailing where clause.
-  bool hasTrailingWhereClause() const {
-    return FirstTrailingWhereArg < Requirements.size();
-  }
-
-  /// Add a trailing 'where' clause to the list of requirements.
-  ///
-  /// Trailing where clauses are written outside the angle brackets, after the
-  /// main part of a declaration's signature.
-  void addTrailingWhereClause(ASTContext &ctx, SourceLoc trailingWhereLoc,
-                              ArrayRef<RequirementRepr> trailingRequirements);
 
   /// Retrieve the outer generic parameter list.
   ///
@@ -1309,6 +1281,8 @@ class GenericParamList final :
   /// for more information.
   void setOuterParameters(GenericParamList *Outer) { OuterParameters = Outer; }
 
+  void setDeclContext(DeclContext *dc);
+
   SourceLoc getLAngleLoc() const { return Brackets.Start; }
   SourceLoc getRAngleLoc() const { return Brackets.End; }
 
@@ -1319,19 +1293,10 @@ class GenericParamList final :
     if (WhereLoc.isInvalid())
       return SourceRange();
 
-    auto endLoc = Requirements[FirstTrailingWhereArg-1].getSourceRange().End;
+    auto endLoc = Requirements.back().getSourceRange().End;
     return SourceRange(WhereLoc, endLoc);
   }
 
-  /// Retrieve the source range covering the trailing where clause.
-  SourceRange getTrailingWhereClauseSourceRange() const {
-    if (!hasTrailingWhereClause())
-      return SourceRange();
-
-    return SourceRange(TrailingWhereLoc,
-                       Requirements.back().getSourceRange().End);
-  }
-
   /// Configure the depth of the generic parameters in this list.
   void setDepth(unsigned depth);
 
@@ -1413,6 +1378,11 @@ class GenericContext : private _GenericContext, public DeclContext {
   /// this context is not generic.
   GenericParamList *getGenericParams() const;
 
+  /// Retrieve the generic parameters as written in source. Unlike
+  /// getGenericParams() this will not synthesize generic parameters for
+  /// extensions, protocols and certain type aliases.
+  GenericParamList *getParsedGenericParams() const;
+
   /// Determine whether this context has generic parameters
   /// of its own.
   ///

include/swift/AST/TypeCheckRequests.h

@@ -396,6 +396,9 @@ struct WhereClauseOwner {
   WhereClauseOwner(DeclContext *dc, GenericParamList *genericParams)
       : dc(dc), source(genericParams) {}
 
+  WhereClauseOwner(DeclContext *dc, TrailingWhereClause *where)
+      : dc(dc), source(where) {}
+
   WhereClauseOwner(DeclContext *dc, SpecializeAttr *attr)
       : dc(dc), source(attr) {}
 

include/swift/Parse/Parser.h

@@ -1647,9 +1647,7 @@ class Parser {
   diagnoseWhereClauseInGenericParamList(const GenericParamList *GenericParams);
 
   ParserStatus
-  parseFreestandingGenericWhereClause(GenericContext *genCtx,
-                                      GenericParamList *&GPList,
-                                      ParseDeclOptions flags);
+  parseFreestandingGenericWhereClause(GenericContext *genCtx);
 
   ParserStatus parseGenericWhereClause(
       SourceLoc &WhereLoc, SmallVectorImpl<RequirementRepr> &Requirements,

lib/AST/ASTDumper.cpp

@@ -561,8 +561,7 @@ namespace {
       };
 
       if (const auto GC = Owner.dyn_cast<const GenericContext *>()) {
-        if (!GC->isGeneric() || isa<ProtocolDecl>(GC))
-          printWhere(GC->getTrailingWhereClause());
+        printWhere(GC->getTrailingWhereClause());
       } else {
         const auto ATD = Owner.get<const AssociatedTypeDecl *>();
         printWhere(ATD->getTrailingWhereClause());
@@ -730,9 +729,9 @@ namespace {
       OS << ' ';
       printDeclName(VD);
       if (auto *AFD = dyn_cast<AbstractFunctionDecl>(VD))
-        printGenericParameters(OS, AFD->getGenericParams());
+        printGenericParameters(OS, AFD->getParsedGenericParams());
       if (auto *GTD = dyn_cast<GenericTypeDecl>(VD))
-        printGenericParameters(OS, GTD->getGenericParams());
+        printGenericParameters(OS, GTD->getParsedGenericParams());
 
       if (auto *var = dyn_cast<VarDecl>(VD)) {
         PrintWithColorRAII(OS, TypeColor) << " type='";

lib/AST/ASTScopeCreation.cpp

@@ -1599,9 +1599,13 @@ ASTScopeImpl *GenericTypeOrExtensionWholePortion::expandScope(
   if (scope->shouldHaveABody() && !scope->doesDeclHaveABody())
     return ip;
 
+  auto *context = scope->getGenericContext();
+  auto *genericParams = (isa<TypeAliasDecl>(context)
+                         ? context->getParsedGenericParams()
+                         : context->getGenericParams());
   auto *deepestScope = scopeCreator.addNestedGenericParamScopesToTree(
-      scope->getDecl(), scope->getGenericContext()->getGenericParams(), scope);
-  if (scope->getGenericContext()->getTrailingWhereClause())
+      scope->getDecl(), genericParams, scope);
+  if (context->getTrailingWhereClause())
     scope->createTrailingWhereClauseScope(deepestScope, scopeCreator);
   scope->createBodyScope(deepestScope, scopeCreator);
   return ip;

lib/AST/ASTScopeLookup.cpp

@@ -292,7 +292,10 @@ NullablePtr<const GenericParamList> GenericTypeScope::genericParams() const {
   // Sigh... These must be here so that from body, we search generics before
   // members. But they also must be on the Decl scope for lookups starting from
   // generic parameters, where clauses, etc.
-  return getGenericContext()->getGenericParams();
+  auto *context = getGenericContext();
+  if (isa<TypeAliasDecl>(context))
+    return context->getParsedGenericParams();
+  return context->getGenericParams();
 }
 NullablePtr<const GenericParamList> ExtensionScope::genericParams() const {
   return decl->getGenericParams();
@@ -367,6 +370,22 @@ bool GenericTypeOrExtensionWhereOrBodyPortion::lookupMembersOf(
                                 });
 }
 
+bool GenericTypeOrExtensionWherePortion::lookupMembersOf(
+    const GenericTypeOrExtensionScope *scope,
+    ArrayRef<const ASTScopeImpl *> history,
+    ASTScopeImpl::DeclConsumer consumer) const {
+  if (!scope->areMembersVisibleFromWhereClause())
+    return false;
+
+  return GenericTypeOrExtensionWhereOrBodyPortion::lookupMembersOf(
+    scope, history, consumer);
+}
+
+bool GenericTypeOrExtensionScope::areMembersVisibleFromWhereClause() const {
+  auto *decl = getDecl();
+  return isa<ProtocolDecl>(decl) || isa<ExtensionDecl>(decl);
+}
+
 #pragma mark looking in locals or members - locals
 
 bool GenericParamScope::lookupLocalsOrMembers(ArrayRef<const ASTScopeImpl *>,

lib/AST/ASTWalker.cpp

@@ -129,7 +129,7 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
   bool visitGenericParamListIfNeeded(GenericContext *GC) {
     // Must check this first in case extensions have not been bound yet
     if (Walker.shouldWalkIntoGenericParams()) {
-      if (auto *params = GC->getGenericParams()) {
+      if (auto *params = GC->getParsedGenericParams()) {
         visitGenericParamList(params);
       }
       return true;
@@ -142,11 +142,6 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
       for (auto &Req: Where->getRequirements())
         if (doIt(Req))
           return true;
-    } else if (!isa<ExtensionDecl>(GC)) {
-      if (const auto GP = GC->getGenericParams())
-        for (auto Req: GP->getTrailingRequirements())
-          if (doIt(Req))
-            return true;
     }
     return false;
   }
@@ -446,7 +441,7 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
     }
 
     // Visit param conformance
-    for (auto Req : GPL->getNonTrailingRequirements()) {
+    for (auto Req : GPL->getRequirements()) {
       if (doIt(Req))
         return true;
     }