Merge pull request #37801 from slavapestov/fix-perf-regressions-5.5

Fix some performance regressions [5.5]

Author: slavapestov

include/swift/AST/TypeCheckRequests.h

@@ -606,7 +606,7 @@ class PropertyWrapperTypeInfoRequest
 
 public:
   // Caching
-  bool isCached() const;
+  bool isCached() const { return true; }
 };
 
 /// Request the nominal type declaration to which the given custom attribute
@@ -627,7 +627,7 @@ class AttachedPropertyWrappersRequest :
 
 public:
   // Caching
-  bool isCached() const;
+  bool isCached() const { return true; }
 };
 
 /// Request the raw (possibly unbound generic) type of the property wrapper
@@ -648,7 +648,7 @@ class AttachedPropertyWrapperTypeRequest :
 
 public:
   // Caching
-  bool isCached() const;
+  bool isCached() const { return true; }
 };
 
 /// Request the nominal type declaration to which the given custom attribute
@@ -669,7 +669,7 @@ class PropertyWrapperBackingPropertyTypeRequest :
 
 public:
   // Caching
-  bool isCached() const;
+  bool isCached() const { return true; }
 };
 
 /// Request information about the mutability of composed property wrappers.
@@ -689,7 +689,7 @@ class PropertyWrapperMutabilityRequest :
 
 public:
   // Caching
-  bool isCached() const;
+  bool isCached() const { return true; }
 };
 
 /// Request information about the l-valueness of composed property wrappers.
@@ -709,7 +709,7 @@ class PropertyWrapperLValuenessRequest :
 
 public:
   // Caching
-  bool isCached() const;
+  bool isCached() const { return true; }
 };
 
 /// Request the synthesized auxiliary declarations for a wrapped property.
@@ -729,7 +729,7 @@ class PropertyWrapperAuxiliaryVariablesRequest :
 
 public:
   // Caching
-  bool isCached() const;
+  bool isCached() const { return true; }
 };
 
 /// Request information about initialization of the backing property
@@ -750,7 +750,7 @@ class PropertyWrapperInitializerInfoRequest :
 
 public:
   // Caching
-  bool isCached() const;
+  bool isCached() const { return true; }
 };
 
 /// Retrieve the structural type of an alias type.
@@ -833,7 +833,7 @@ class AttachedResultBuilderRequest :
 
 public:
   // Caching
-  bool isCached() const;
+  bool isCached() const { return true; }
 };
 
 /// Request the result builder type attached to the given declaration,

lib/AST/Decl.cpp

@@ -5937,17 +5937,33 @@ llvm::TinyPtrVector<CustomAttr *> VarDecl::getAttachedPropertyWrappers() const {
 
 /// Whether this property has any attached property wrappers.
 bool VarDecl::hasAttachedPropertyWrapper() const {
-  return !getAttachedPropertyWrappers().empty() || hasImplicitPropertyWrapper();
+  if (getAttrs().hasAttribute<CustomAttr>()) {
+    if (!getAttachedPropertyWrappers().empty())
+      return true;
+  }
+
+  if (hasImplicitPropertyWrapper())
+    return true;
+
+  return false;
 }
 
 bool VarDecl::hasImplicitPropertyWrapper() const {
-  if (!getAttachedPropertyWrappers().empty())
+  if (getAttrs().hasAttribute<CustomAttr>()) {
+    if (!getAttachedPropertyWrappers().empty())
+      return false;
+  }
+
+  if (isImplicit())
     return false;
 
-  auto *dc = getDeclContext();
-  bool isClosureParam = isa<ParamDecl>(this) &&
-      dc->getContextKind() == DeclContextKind::AbstractClosureExpr;
-  return !isImplicit() && getName().hasDollarPrefix() && isClosureParam;
+  if (!isa<ParamDecl>(this))
+    return false;
+
+  if (!isa<AbstractClosureExpr>(getDeclContext()))
+    return false;
+
+  return getName().hasDollarPrefix();
 }
 
 bool VarDecl::hasExternalPropertyWrapper() const {

lib/AST/DeclContext.cpp

@@ -1038,11 +1038,22 @@ IterableDeclContext::castDeclToIterableDeclContext(const Decl *D) {
 }
 
 Optional<Fingerprint> IterableDeclContext::getBodyFingerprint() const {
-  auto mutableThis = const_cast<IterableDeclContext *>(this);
-  return evaluateOrDefault(getASTContext().evaluator,
-                           ParseMembersRequest{mutableThis},
-                           FingerprintAndMembers())
-      .fingerprint;
+  auto fileUnit = dyn_cast<FileUnit>(getAsGenericContext()->getModuleScopeContext());
+  if (!fileUnit)
+    return None;
+
+  if (isa<SourceFile>(fileUnit)) {
+    auto mutableThis = const_cast<IterableDeclContext *>(this);
+    return evaluateOrDefault(getASTContext().evaluator,
+                             ParseMembersRequest{mutableThis},
+                             FingerprintAndMembers())
+        .fingerprint;
+  }
+
+  if (getDecl()->isImplicit())
+    return None;
+
+  return fileUnit->loadFingerprint(this);
 }
 
 /// Return the DeclContext to compare when checking private access in

lib/AST/TypeCheckRequests.cpp

@@ -468,47 +468,6 @@ void DefaultTypeRequest::cacheResult(Type value) const {
   cacheEntry = value;
 }
 
-bool PropertyWrapperTypeInfoRequest::isCached() const {
-  auto nominal = std::get<0>(getStorage());
-  return nominal->getAttrs().hasAttribute<PropertyWrapperAttr>();;
-}
-
-bool AttachedPropertyWrappersRequest::isCached() const {
-  auto var = std::get<0>(getStorage());
-  return !var->getAttrs().isEmpty();
-}
-
-bool AttachedPropertyWrapperTypeRequest::isCached() const {
-  auto var = std::get<0>(getStorage());
-  return !var->getAttrs().isEmpty();
-}
-
-bool PropertyWrapperBackingPropertyTypeRequest::isCached() const {
-  auto var = std::get<0>(getStorage());
-  return !var->getAttrs().isEmpty() &&
-         !(isa<ParamDecl>(var) && isa<ClosureExpr>(var->getDeclContext()));
-}
-
-bool PropertyWrapperAuxiliaryVariablesRequest::isCached() const {
-  auto var = std::get<0>(getStorage());
-  return !var->getAttrs().isEmpty() || var->hasImplicitPropertyWrapper();
-}
-
-bool PropertyWrapperInitializerInfoRequest::isCached() const {
-  auto var = std::get<0>(getStorage());
-  return !var->getAttrs().isEmpty() || var->hasImplicitPropertyWrapper();
-}
-
-bool PropertyWrapperMutabilityRequest::isCached() const {
-  auto var = std::get<0>(getStorage());
-  return !var->getAttrs().isEmpty() || var->hasImplicitPropertyWrapper();
-}
-
-bool PropertyWrapperLValuenessRequest::isCached() const {
-  auto var = std::get<0>(getStorage());
-  return !var->getAttrs().isEmpty() || var->hasImplicitPropertyWrapper();
-}
-
 void swift::simple_display(
     llvm::raw_ostream &out, const PropertyWrapperTypeInfo &propertyWrapper) {
   out << "{ ";
@@ -609,16 +568,6 @@ void swift::simple_display(llvm::raw_ostream &out,
       << (value.allowUsableFromInline ? "true" : "false");
 }
 
-//----------------------------------------------------------------------------//
-// ResultBuilder-related requests.
-//----------------------------------------------------------------------------//
-
-bool AttachedResultBuilderRequest::isCached() const {
-  // Only needs to be cached if there are any custom attributes.
-  auto var = std::get<0>(getStorage());
-  return var->getAttrs().hasAttribute<CustomAttr>();
-}
-
 //----------------------------------------------------------------------------//
 // SelfAccessKindRequest computation.
 //----------------------------------------------------------------------------//