Merge pull request #26437 from nkcsgexi/HasDynamicMemberLookupAttributeRequest

IDE+Evaluator: refactor the sema implementation of hasDynamicMemberLookupAttribute to a request and move the function wrapper to libIDE. NFC

Author: nkcsgexi

include/swift/Sema/IDETypeCheckingRequestIDZone.def

@@ -18,3 +18,4 @@ SWIFT_TYPEID(IsDeclApplicableRequest)
 SWIFT_TYPEID(TypeRelationCheckRequest)
 SWIFT_TYPEID(RootAndResultTypeOfKeypathDynamicMemberRequest)
 SWIFT_TYPEID(RootTypeOfKeypathDynamicMemberRequest)
+SWIFT_TYPEID(HasDynamicMemberLookupAttributeRequest)

include/swift/Sema/IDETypeCheckingRequests.h

@@ -234,6 +234,29 @@ class RootTypeOfKeypathDynamicMemberRequest:
   SourceLoc getNearestLoc() const { return SourceLoc(); };
 };
 
+//----------------------------------------------------------------------------//
+// HasDynamicMemberLookupAttributeRequest
+//----------------------------------------------------------------------------//
+class HasDynamicMemberLookupAttributeRequest:
+    public SimpleRequest<HasDynamicMemberLookupAttributeRequest,
+                         bool(TypeBase*),
+                         CacheKind::Cached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  llvm::Expected<bool> evaluate(Evaluator &evaluator, TypeBase *ty) const;
+
+public:
+  // Caching
+  bool isCached() const { return true; }
+  // Source location
+  SourceLoc getNearestLoc() const { return SourceLoc(); };
+};
+
 /// The zone number for the IDE.
 #define SWIFT_IDE_TYPE_CHECK_REQUESTS_TYPEID_ZONE 97
 #define SWIFT_TYPEID_ZONE SWIFT_IDE_TYPE_CHECK_REQUESTS_TYPEID_ZONE

lib/IDE/IDETypeChecking.cpp

@@ -782,3 +782,8 @@ Type swift::getResultTypeOfKeypathDynamicMember(SubscriptDecl *SD) {
     RootAndResultTypeOfKeypathDynamicMemberRequest{SD}, TypePair()).
       SecondTy;
 }
+
+bool swift::hasDynamicMemberLookupAttribute(Type ty) {
+  return evaluateOrDefault(ty->getASTContext().evaluator,
+    HasDynamicMemberLookupAttributeRequest{ty.getPointer()}, false);
+}

lib/Sema/CSSimplify.cpp

@@ -3918,7 +3918,7 @@ ConstraintSystem::simplifyFunctionComponentConstraint(
 /// particularly fast in the face of deep class hierarchies or lots of protocol
 /// conformances, but this is fine because it doesn't get invoked in the normal
 /// name lookup path (only when lookup is about to fail).
-static bool hasDynamicMemberLookupAttribute(Type type,
+bool swift::hasDynamicMemberLookupAttribute(Type type,
                     llvm::DenseMap<CanType, bool> &DynamicMemberLookupCache) {
   auto canType = type->getCanonicalType();
   auto it = DynamicMemberLookupCache.find(canType);
@@ -3992,12 +3992,6 @@ static bool hasDynamicMemberLookupAttribute(Type type,
   return result;
 }
 
-// for IDETypeChecking
-bool swift::hasDynamicMemberLookupAttribute(Type type) {
-  llvm::DenseMap<CanType, bool> DynamicMemberLookupCache;
-  return ::hasDynamicMemberLookupAttribute(type, DynamicMemberLookupCache);
-}
-
 static bool isForKeyPathSubscript(ConstraintSystem &cs,
                                   ConstraintLocator *locator) {
   if (!locator || !locator->getAnchor())

lib/Sema/IDETypeCheckingRequests.cpp

@@ -135,3 +135,10 @@ RootAndResultTypeOfKeypathDynamicMemberRequest::evaluate(Evaluator &evaluator,
          "invalid keypath dynamic member");
   return TypePair(genericArgs[0], genericArgs[1]);
 }
+
+llvm::Expected<bool>
+HasDynamicMemberLookupAttributeRequest::evaluate(Evaluator &evaluator,
+                                                 TypeBase *ty) const {
+  llvm::DenseMap<CanType, bool> DynamicMemberLookupCache;
+  return hasDynamicMemberLookupAttribute(Type(ty), DynamicMemberLookupCache);
+}

lib/Sema/LookupVisibleDecls.cpp

@@ -959,7 +959,8 @@ static void lookupVisibleDynamicMemberLookupDecls(
   if (!seenDynamicLookup.insert(baseType.getPointer()).second)
     return;
 
-  if (!hasDynamicMemberLookupAttribute(baseType))
+  if (!evaluateOrDefault(dc->getASTContext().evaluator,
+         HasDynamicMemberLookupAttributeRequest{baseType.getPointer()}, false))
     return;
 
   auto &ctx = dc->getASTContext();

lib/Sema/TypeChecker.h

@@ -2176,6 +2176,9 @@ bool areGenericRequirementsSatisfied(const DeclContext *DC,
 
 bool canSatisfy(Type type1, Type type2, bool openArchetypes,
                 constraints::ConstraintKind kind, DeclContext *dc);
+
+bool hasDynamicMemberLookupAttribute(Type type,
+  llvm::DenseMap<CanType, bool> &DynamicMemberLookupCache);
 } // end namespace swift
 
 #endif