---

yaml
---
r: 323539
b: refs/heads/tensorflow-next
c: fcdb6db
h: refs/heads/master
i:
  323537: bee9b6f
  323535: abb8172

Author: swift-ci

[refs]

@@ -1461,4 +1461,4 @@ refs/heads/master-rebranch: 86e95c23aa0d37f24ec138b7853146c1cead2e40
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
-refs/heads/tensorflow-next: 55806395fbde12af4e64647c4e90bc549465575c
+refs/heads/tensorflow-next: fcdb6dbaca3342336f23a1a29aa1f3c9bd533210

branches/tensorflow-next/include/swift/AST/AccessRequests.h

@@ -32,9 +32,8 @@ class ValueDecl;
 /// Request the AccessLevel of the given ValueDecl.
 class AccessLevelRequest :
     public SimpleRequest<AccessLevelRequest,
-                         CacheKind::SeparatelyCached,
-                         AccessLevel,
-                         ValueDecl *> {
+                         AccessLevel(ValueDecl *),
+                         CacheKind::SeparatelyCached> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -61,9 +60,8 @@ class AccessLevelRequest :
 /// the accessibility of mutating accessors.
 class SetterAccessLevelRequest :
     public SimpleRequest<SetterAccessLevelRequest,
-                         CacheKind::SeparatelyCached,
-                         AccessLevel,
-                         AbstractStorageDecl *> {
+                         AccessLevel(AbstractStorageDecl *),
+                         CacheKind::SeparatelyCached> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -88,9 +86,8 @@ class SetterAccessLevelRequest :
 /// Request the Default and Max AccessLevels of the given ExtensionDecl.
 class DefaultAndMaxAccessLevelRequest :
     public SimpleRequest<DefaultAndMaxAccessLevelRequest,
-                         CacheKind::SeparatelyCached,
-                         std::pair<AccessLevel, AccessLevel>,
-                         ExtensionDecl *> {
+                         std::pair<AccessLevel, AccessLevel>(ExtensionDecl *),
+                         CacheKind::SeparatelyCached> {
 public:
   using SimpleRequest::SimpleRequest;
   using DefaultAndMax = std::pair<AccessLevel, AccessLevel>;

branches/tensorflow-next/include/swift/AST/NameLookupRequests.h

@@ -56,10 +56,10 @@ using DirectlyReferencedTypeDecls = llvm::TinyPtrVector<TypeDecl *>;
 /// The inherited declaration of \c D at index 1 is the typealias Alias.
 class InheritedDeclsReferencedRequest :
   public SimpleRequest<InheritedDeclsReferencedRequest,
-                       CacheKind::Uncached, // FIXME: Cache these
-                       DirectlyReferencedTypeDecls,
-                       llvm::PointerUnion<TypeDecl *, ExtensionDecl *>,
-                       unsigned>
+                       DirectlyReferencedTypeDecls(
+                         llvm::PointerUnion<TypeDecl *, ExtensionDecl *>,
+                         unsigned),
+                       CacheKind::Uncached> // FIXME: Cache these
 {
   /// Retrieve the TypeLoc for this inherited type.
   TypeLoc &getTypeLoc(llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl,
@@ -107,9 +107,8 @@ class InheritedDeclsReferencedRequest :
 /// using another instance of this request.
 class UnderlyingTypeDeclsReferencedRequest :
   public SimpleRequest<UnderlyingTypeDeclsReferencedRequest,
-                       CacheKind::Uncached, // FIXME: Cache these
-                       DirectlyReferencedTypeDecls,
-                       TypeAliasDecl *>
+                       DirectlyReferencedTypeDecls(TypeAliasDecl *),
+                       CacheKind::Uncached> // FIXME: Cache these
 {
 public:
   using SimpleRequest::SimpleRequest;
@@ -134,9 +133,8 @@ class UnderlyingTypeDeclsReferencedRequest :
 /// Request the superclass declaration for the given class.
 class SuperclassDeclRequest :
     public SimpleRequest<SuperclassDeclRequest,
-                         CacheKind::SeparatelyCached,
-                         ClassDecl *,
-                         NominalTypeDecl *> {
+                         ClassDecl *(NominalTypeDecl *),
+                         CacheKind::SeparatelyCached> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -161,9 +159,8 @@ class SuperclassDeclRequest :
 /// Request the nominal declaration extended by a given extension declaration.
 class ExtendedNominalRequest :
     public SimpleRequest<ExtendedNominalRequest,
-                         CacheKind::SeparatelyCached,
-                         NominalTypeDecl *,
-                         ExtensionDecl *> {
+                         NominalTypeDecl *(ExtensionDecl *),
+                         CacheKind::SeparatelyCached> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -194,9 +191,9 @@ struct SelfBounds {
 /// constraints in the "where" clause of a protocol extension.
 class SelfBoundsFromWhereClauseRequest :
     public SimpleRequest<SelfBoundsFromWhereClauseRequest,
-                         CacheKind::Uncached,
-                         SelfBounds,
-                         llvm::PointerUnion<TypeDecl *, ExtensionDecl *>> {
+                         SelfBounds(llvm::PointerUnion<TypeDecl *,
+                                    ExtensionDecl *>),
+                         CacheKind::Uncached> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -219,9 +216,8 @@ class SelfBoundsFromWhereClauseRequest :
 /// clause of an extension.
 class TypeDeclsFromWhereClauseRequest :
     public SimpleRequest<TypeDeclsFromWhereClauseRequest,
-                         CacheKind::Uncached,
-                         DirectlyReferencedTypeDecls,
-                         ExtensionDecl *> {
+                         DirectlyReferencedTypeDecls(ExtensionDecl *),
+                         CacheKind::Uncached> {
 public:
   using SimpleRequest::SimpleRequest;
 
@@ -243,10 +239,8 @@ class TypeDeclsFromWhereClauseRequest :
 /// refers.
 class CustomAttrNominalRequest :
     public SimpleRequest<CustomAttrNominalRequest,
-                         CacheKind::Cached,
-                         NominalTypeDecl *,
-                         CustomAttr *,
-                         DeclContext *> {
+                         NominalTypeDecl *(CustomAttr *, DeclContext *),
+                         CacheKind::Cached> {
 public:
   using SimpleRequest::SimpleRequest;
 

branches/tensorflow-next/include/swift/AST/SimpleRequest.h

@@ -47,11 +47,10 @@ enum class CacheKind {
 /// the given type.
 ///
 /// \tparam Derived The final, derived class type for the request.
+/// \tparam Signature The signature of the request, described as a
+/// function type whose inputs (\c Inputs) are the parameter types and
+/// whose output (\c Output) is the result of evaluating this request.
 /// \tparam Caching Describes how the output value is cached, if at all.
-/// \tparam Output The type of the result produced by evaluating this request.
-/// \tparam Inputs The types of the inputs to this request, i.e., the values
-/// that comprise the request itself. These will determine the uniqueness of
-/// the request.
 ///
 /// The \c Derived class needs to implement several operations. The most
 /// important one takes an evaluator and the input values, then computes the
@@ -84,9 +83,12 @@ enum class CacheKind {
 ///   Optional<Output> getCachedResult() const;
 ///   void cacheResult(Output value) const;
 /// \endcode
+template<typename Derived, typename Signature, CacheKind Caching>
+class SimpleRequest;
+
 template<typename Derived, CacheKind Caching, typename Output,
          typename ...Inputs>
-class SimpleRequest {
+class SimpleRequest<Derived, Output(Inputs...), Caching> {
   std::tuple<Inputs...> storage;
 
   Derived &asDerived() {