AST: Move ResilienceExpansion to a request

Author: xymus

include/swift/AST/ASTTypeIDZone.def

@@ -24,6 +24,7 @@ SWIFT_TYPEID(TypePair)
 SWIFT_TYPEID(PropertyWrapperBackingPropertyInfo)
 SWIFT_TYPEID(PropertyWrapperTypeInfo)
 SWIFT_TYPEID(CtorInitializerKind)
+SWIFT_TYPEID(ResilienceExpansion)
 SWIFT_TYPEID_NAMED(Optional<PropertyWrapperMutability>, PropertyWrapperMutability)
 SWIFT_TYPEID_NAMED(CustomAttr *, CustomAttr)
 SWIFT_TYPEID_NAMED(TypeAliasDecl *, TypeAliasDecl)

include/swift/AST/TypeCheckRequests.h

@@ -662,6 +662,29 @@ class StructuralTypeRequest :
   bool isCached() const { return true; }
 };
 
+/// Request the most optimal resilience expansion for the code in the context.
+class ResilienceExpansionRequest :
+    public SimpleRequest<ResilienceExpansionRequest,
+                         ResilienceExpansion(DeclContext*),
+                         CacheKind::Cached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  llvm::Expected<ResilienceExpansion> evaluate(Evaluator &eval,
+                                               DeclContext *context) const;
+
+public:
+  // Caching.
+  bool isCached() const { return true; }
+};
+
+void simple_display(llvm::raw_ostream &out,
+                    const ResilienceExpansion &value);
+
 /// Request the custom attribute which attaches a function builder to the
 /// given declaration.
 class AttachedFunctionBuilderRequest :

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -30,6 +30,7 @@ SWIFT_TYPEID(RequirementSignatureRequest)
 SWIFT_TYPEID(DefaultDefinitionTypeRequest)
 SWIFT_TYPEID(USRGenerationRequest)
 SWIFT_TYPEID(StructuralTypeRequest)
+SWIFT_TYPEID(ResilienceExpansionRequest)
 SWIFT_TYPEID(DefaultTypeRequest)
 SWIFT_TYPEID(MangleLocalTypeDeclRequest)
 SWIFT_TYPEID(PropertyWrapperTypeInfoRequest)

lib/AST/DeclContext.cpp

@@ -20,6 +20,7 @@
 #include "swift/AST/LazyResolver.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/Types.h"
+#include "swift/AST/TypeCheckRequests.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Basic/Statistic.h"
 #include "llvm/ADT/DenseMap.h"
@@ -310,7 +311,16 @@ bool DeclContext::isGenericContext() const {
 /// domains, this ensures that only sufficiently-conservative access patterns
 /// are used.
 ResilienceExpansion DeclContext::getResilienceExpansion() const {
-  for (const auto *dc = getLocalContext(); dc && dc->isLocalContext();
+  auto &context = getASTContext();
+  return evaluateOrDefault(context.evaluator,
+                           ResilienceExpansionRequest { const_cast<DeclContext *>(this) },
+                           ResilienceExpansion::Minimal);
+}
+
+llvm::Expected<ResilienceExpansion>
+  swift::ResilienceExpansionRequest::evaluate(Evaluator &eval,
+                                              DeclContext *context) const {
+  for (const auto *dc = context->getLocalContext(); dc && dc->isLocalContext();
        dc = dc->getParent()) {
     // Default argument initializer contexts have their resilience expansion
     // set when they're type checked.

lib/AST/TypeCheckRequests.cpp

@@ -615,6 +615,11 @@ void swift::simple_display(llvm::raw_ostream &os, PropertyWrapperMutability m) {
   os << "getter " << names[m.Getter] << ", setter " << names[m.Setter];
 }
 
+void swift::simple_display(llvm::raw_ostream &out,
+                           const ResilienceExpansion &value) {
+  out << value;
+}
+
 //----------------------------------------------------------------------------//
 // FunctionBuilder-related requests.
 //----------------------------------------------------------------------------//