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

Author: swift-ci

include/swift/AST/ASTTypeIDZone.def

@@ -35,3 +35,4 @@ SWIFT_TYPEID_NAMED(GenericSignature *, GenericSignature)
 SWIFT_TYPEID_NAMED(GenericTypeParamType *, GenericTypeParamType)
 SWIFT_TYPEID(Requirement)
 SWIFT_TYPEID_NAMED(IterableDeclContext *, IterableDeclContext)
+SWIFT_TYPEID_NAMED(GenericParamList *, GenericParamList)

include/swift/AST/ASTTypeIDs.h

@@ -23,6 +23,7 @@ namespace swift {
 
 class CustomAttr;
 class Decl;
+class GenericParamList;
 class GenericSignature;
 class GenericTypeParamType;
 class IterableDeclContext;

include/swift/AST/Decl.h

@@ -1496,7 +1496,7 @@ class alignas(RequirementRepr) TrailingWhereClause final :
 class alignas(8) _GenericContext {
 // Not really public. See GenericContext.
 public:
-  GenericParamList *GenericParams = nullptr;
+  llvm::PointerIntPair<GenericParamList *, 1, bool> GenericParamsAndBit;
 
   /// The trailing where clause.
   ///
@@ -1509,16 +1509,16 @@ class alignas(8) _GenericContext {
 };
 
 class GenericContext : private _GenericContext, public DeclContext {
+  friend class GenericParamListRequest;
+
 protected:
-  GenericContext(DeclContextKind Kind, DeclContext *Parent)
-    : _GenericContext(), DeclContext(Kind, Parent) { }
+  GenericContext(DeclContextKind Kind, DeclContext *Parent,
+                 GenericParamList *Params);
 
 public:
   /// Retrieve the set of parameters to a generic context, or null if
   /// this context is not generic.
-  GenericParamList *getGenericParams() const { return GenericParams; }
-
-  void setGenericParams(GenericParamList *GenericParams);
+  GenericParamList *getGenericParams() const;
 
   /// Determine whether this context has generic parameters
   /// of its own.
@@ -1533,7 +1533,7 @@ class GenericContext : private _GenericContext, public DeclContext {
   ///   func p()   // isGeneric == false
   /// }
   /// \endcode
-  bool isGeneric() const { return GenericParams != nullptr; }
+  bool isGeneric() const { return getGenericParams() != nullptr; }
 
   /// Retrieve the trailing where clause for this extension, if any.
   TrailingWhereClause *getTrailingWhereClause() const {
@@ -1771,8 +1771,6 @@ class ExtensionDecl final : public GenericContext, public Decl,
     return getValidationState() > ValidationState::CheckingWithValidSignature;
   }
 
-  void createGenericParamsIfMissing(NominalTypeDecl *nominal);
-
   bool hasDefaultAccessLevel() const {
     return Bits.ExtensionDecl.DefaultAndMaxAccessLevel != 0;
   }
@@ -3328,7 +3326,6 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
     GenericTypeDecl(K, DC, name, NameLoc, inherited, GenericParams),
     IterableDeclContext(IterableDeclContextKind::NominalTypeDecl)
   {
-    setGenericParams(GenericParams);
     Bits.NominalTypeDecl.AddedImplicitInitializers = false;
     ExtensionGeneration = 0;
     Bits.NominalTypeDecl.HasLazyConformances = false;
@@ -4344,10 +4341,6 @@ class ProtocolDecl final : public NominalTypeDecl {
   /// with the Objective-C runtime.
   StringRef getObjCRuntimeName(llvm::SmallVectorImpl<char> &buffer) const;
 
-  /// Create the generic parameters of this protocol if they haven't been
-  /// created yet.
-  void createGenericParamsIfMissing();
-
   /// Retrieve the requirements that describe this protocol.
   ///
   /// These are the requirements including any inherited protocols
@@ -5437,7 +5430,7 @@ class SubscriptDecl : public GenericContext, public AbstractStorageDecl {
                 SourceLoc SubscriptLoc, ParameterList *Indices,
                 SourceLoc ArrowLoc, TypeLoc ElementTy, DeclContext *Parent,
                 GenericParamList *GenericParams)
-    : GenericContext(DeclContextKind::SubscriptDecl, Parent),
+    : GenericContext(DeclContextKind::SubscriptDecl, Parent, GenericParams),
       AbstractStorageDecl(DeclKind::Subscript,
                           StaticSpelling != StaticSpellingKind::None,
                           Parent, Name, SubscriptLoc,
@@ -5446,7 +5439,6 @@ class SubscriptDecl : public GenericContext, public AbstractStorageDecl {
       Indices(nullptr), ElementTy(ElementTy) {
     Bits.SubscriptDecl.StaticSpelling = static_cast<unsigned>(StaticSpelling);
     setIndices(Indices);
-    setGenericParams(GenericParams);
   }
 
   /// \returns the way 'static'/'class' was spelled in the source.
@@ -5611,11 +5603,10 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
                        SourceLoc NameLoc, bool Throws, SourceLoc ThrowsLoc,
                        bool HasImplicitSelfDecl,
                        GenericParamList *GenericParams)
-      : GenericContext(DeclContextKind::AbstractFunctionDecl, Parent),
+      : GenericContext(DeclContextKind::AbstractFunctionDecl, Parent, GenericParams),
         ValueDecl(Kind, Parent, Name, NameLoc),
         Body(nullptr), ThrowsLoc(ThrowsLoc) {
     setBodyKind(BodyKind::None);
-    setGenericParams(GenericParams);
     Bits.AbstractFunctionDecl.HasImplicitSelfDecl = HasImplicitSelfDecl;
     Bits.AbstractFunctionDecl.Overridden = false;
     Bits.AbstractFunctionDecl.Throws = Throws;
@@ -7267,6 +7258,16 @@ inline void simple_display(llvm::raw_ostream &out,
   simple_display(out, static_cast<const Decl *>(decl));
 }
 
+/// Display GenericContext.
+///
+/// The template keeps this sorted down in the overload set relative to the
+/// more concrete overloads with Decl pointers thereby breaking a potential ambiguity.
+template <typename T>
+inline typename std::enable_if<std::is_same<T, GenericContext>::value>::type
+simple_display(llvm::raw_ostream &out, const T *GC) {
+  simple_display(out, GC->getAsDecl());
+}
+
 /// Display GenericParamList.
 void simple_display(llvm::raw_ostream &out, const GenericParamList *GPL);
 

include/swift/AST/NameLookupRequests.h

@@ -25,6 +25,8 @@ namespace swift {
 
 class ClassDecl;
 class DestructorDecl;
+class GenericContext;
+class GenericParamList;
 class TypeAliasDecl;
 class TypeDecl;
 
@@ -250,6 +252,27 @@ class GetDestructorRequest :
   void cacheResult(DestructorDecl *value) const;
 };
 
+class GenericParamListRequest :
+    public SimpleRequest<GenericParamListRequest,
+                         GenericParamList *(GenericContext *),
+                         CacheKind::SeparatelyCached> {
+public:
+  using SimpleRequest::SimpleRequest;
+  
+private:
+  friend SimpleRequest;
+  
+  // Evaluation.
+  llvm::Expected<GenericParamList *>
+  evaluate(Evaluator &evaluator, GenericContext *value) const;
+  
+public:
+  // Separate caching.
+  bool isCached() const { return true; }
+  Optional<GenericParamList *> getCachedResult() const;
+  void cacheResult(GenericParamList *value) const;
+};
+
 #define SWIFT_TYPEID_ZONE NameLookup
 #define SWIFT_TYPEID_HEADER "swift/AST/NameLookupTypeIDZone.def"
 #include "swift/Basic/DefineTypeIDZone.h"

include/swift/AST/NameLookupTypeIDZone.def

@@ -21,6 +21,9 @@ SWIFT_REQUEST(NameLookup, CustomAttrNominalRequest,
 SWIFT_REQUEST(NameLookup, ExtendedNominalRequest,
               NominalTypeDecl *(ExtensionDecl *), SeparatelyCached,
               NoLocationInfo)
+SWIFT_REQUEST(NameLookup, GenericParamListRequest,
+              GenericParamList *(GenericContext *), SeparatelyCached,
+              NoLocationInfo)
 SWIFT_REQUEST(NameLookup, GetDestructorRequest, DestructorDecl *(ClassDecl *),
               SeparatelyCached, NoLocationInfo)
 SWIFT_REQUEST(NameLookup, InheritedDeclsReferencedRequest,

include/swift/Parse/Parser.h

@@ -1589,7 +1589,7 @@ class Parser {
     AssociatedType
   };
   ParserStatus
-  parseFreestandingGenericWhereClause(GenericParamList *&GPList,
+  parseFreestandingGenericWhereClause(GenericParamList *GPList,
                              WhereClauseKind kind=WhereClauseKind::Declaration);
 
   ParserStatus parseGenericWhereClause(

lib/AST/ASTScopeCreation.cpp

@@ -819,7 +819,6 @@ class NodeAdder
 
   NullablePtr<ASTScopeImpl> visitProtocolDecl(ProtocolDecl *e, ASTScopeImpl *p,
                                               ScopeCreator &scopeCreator) {
-    e->createGenericParamsIfMissing();
     return scopeCreator.ifUniqueConstructWithPortionExpandAndInsert<
         NominalTypeScope, GenericTypeOrExtensionWholePortion>(p, e);
   }