Merge pull request swiftlang#18946 from DougGregor/specialize-validation

Author: swift-ci

include/swift/AST/TypeCheckRequests.h

@@ -29,6 +29,7 @@ namespace swift {
 
 class GenericParamList;
 class RequirementRepr;
+class SpecializeAttr;
 struct TypeLoc;
 
 /// Display a nominal type or extension thereof.
@@ -220,22 +221,27 @@ struct WhereClauseOwner {
 
   /// The source of the where clause, which can be a generic parameter list
   /// or a declaration that can have a where clause.
-  llvm::PointerUnion<GenericParamList *, Decl *> source;
+  llvm::PointerUnion3<GenericParamList *, Decl *, SpecializeAttr *> source;
 
   WhereClauseOwner(Decl *decl);
 
   WhereClauseOwner(DeclContext *dc, GenericParamList *genericParams)
     : dc(dc), source(genericParams) { }
 
+  WhereClauseOwner(DeclContext *dc, SpecializeAttr *attr)
+    : dc(dc), source(attr) { }
+
   SourceLoc getLoc() const;
 
   friend hash_code hash_value(const WhereClauseOwner &owner) {
-    return hash_combine(hash_value(owner.dc), hash_value(owner.source));
+    return hash_combine(hash_value(owner.dc),
+                        hash_value(owner.source.getOpaqueValue()));
   }
 
   friend bool operator==(const WhereClauseOwner &lhs,
                          const WhereClauseOwner &rhs) {
-    return lhs.dc == rhs.dc && lhs.source == rhs.source;
+    return lhs.dc == rhs.dc &&
+           lhs.source.getOpaqueValue() == rhs.source.getOpaqueValue();
   }
 
   friend bool operator!=(const WhereClauseOwner &lhs,

lib/AST/TypeCheckRequests.cpp

@@ -259,13 +259,18 @@ SourceLoc WhereClauseOwner::getLoc() const {
   if (auto decl = source.dyn_cast<Decl *>())
     return decl->getLoc();
 
+  if (auto attr = source.dyn_cast<SpecializeAttr *>())
+    return attr->getLocation();
+
   return source.get<GenericParamList *>()->getWhereLoc();
 }
 
 void swift::simple_display(llvm::raw_ostream &out,
                            const WhereClauseOwner &owner) {
   if (auto decl = owner.source.dyn_cast<Decl *>()) {
     simple_display(out, decl);
+  } else if (owner.source.is<SpecializeAttr *>()) {
+    out << "@_specialize";
   } else {
     out << "(SIL generic parameter list)";
   }
@@ -289,6 +294,13 @@ RequirementRequest::getRequirements(WhereClauseOwner owner) {
     return genericParams->getRequirements();
   }
 
+  if (auto attr = owner.source.dyn_cast<SpecializeAttr *>()) {
+    if (auto whereClause = attr->getTrailingWhereClause())
+      return whereClause->getRequirements();
+    
+    return { };
+  }
+
   auto decl = owner.source.dyn_cast<Decl *>();
   if (!decl)
     return { };