[Sema] Delay lookup for conditional conformances

Remove diagnostics and sendable checks from ActorIsolationChecker

Author: angela-laar

lib/Sema/CSSimplify.cpp

@@ -9501,9 +9501,10 @@ performMemberLookup(ConstraintKind constraintKind, DeclNameRef memberName,
     instanceTy = baseObjMeta->getInstanceType();
   }
 
+  MemberLookupResult result;
+
   if (instanceTy->isTypeVariableOrMember() ||
       instanceTy->is<UnresolvedType>()) {
-    MemberLookupResult result;
     result.OverallResult = MemberLookupResult::Unsolved;
     return result;
   }
@@ -9513,14 +9514,24 @@ performMemberLookup(ConstraintKind constraintKind, DeclNameRef memberName,
   if (isSingleUnlabeledPackExpansionTuple(instanceTy)) {
     auto elementTy = instanceTy->castTo<TupleType>()->getElementType(0);
     if (elementTy->is<TypeVariableType>()) {
-      MemberLookupResult result;
+      result.OverallResult = MemberLookupResult::Unsolved;
+      return result;
+    }
+  }
+
+  // Delay solving member constraint for unapplied methods
+  // where the base type has a conditional Sendable conformance
+  if (functionRefKind == FunctionRefKind::Unapplied){
+    auto sendableProtocol = DC->getParentModule()->getASTContext().getProtocol(KnownProtocolKind::Sendable);
+    auto baseSendable = swift::TypeChecker::conformsToProtocol(instanceTy, sendableProtocol, DC->getParentModule());
+
+    if (!baseSendable.isInvalid() && !baseSendable.getConditionalRequirements().empty() && instanceTy->hasTypeVariable()) {
       result.OverallResult = MemberLookupResult::Unsolved;
       return result;
     }
   }
 
   // Okay, start building up the result list.
-  MemberLookupResult result;
   result.OverallResult = MemberLookupResult::HasResults;
 
   // Add key path result.
@@ -10520,8 +10531,8 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyMemberConstraint(
     // If requested, generate a constraint.
     if (flags.contains(TMF_GenerateConstraints)) {
       auto *memberRef = Constraint::createMemberOrOuterDisjunction(
-          *this, kind, baseTy, memberTy, member, useDC, functionRefKind,
-          outerAlternatives, locator);
+      *this, kind, baseTy, memberTy, member, useDC, functionRefKind,
+       outerAlternatives, locator);
 
       addUnsolvedConstraint(memberRef);
 
@@ -10576,7 +10587,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyMemberConstraint(
         // It could either be a hole associated directly with the base
         // or a hole which came from result type of the chain.
         if (originatorLoc->isLastElement<
-                LocatorPathElt::UnresolvedMemberChainResult>()) {
+            LocatorPathElt::UnresolvedMemberChainResult>()) {
           auto *UMCR = castToExpr<UnresolvedMemberChainResultExpr>(
               originatorLoc->getAnchor());
           return UMCR->getChainBase() == getAsExpr(locator->getAnchor());

lib/Sema/ConstraintSystem.cpp

@@ -1712,10 +1712,8 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
     auto numLabelsToRemove = getNumRemovedArgumentLabels(
         funcDecl, /*isCurriedInstanceReference=*/false, functionRefKind);
 
-
-    //check the base ... let's check
     //funcType = funcType->withExtInfo(functy->getExtInfo().withConcurrent())->castTo<AnyFunctionType>();
-    
+
     auto openedType = openFunctionType(funcType, locator, replacements,
                                        funcDecl->getDeclContext())
                           ->removeArgumentLabels(numLabelsToRemove);
@@ -2633,8 +2631,15 @@ ConstraintSystem::getTypeOfMemberReference(
     // FIXME: Handle conditional conformances
     auto baseSendable = TypeChecker::conformsToProtocol( baseOpenedTy, sendableProtocol, useDC->getParentModule());
 
-    if (!baseSendable.isInvalid()) {
+    if (isSendableType(useDC->getParentModule(), baseOpenedTy)) {
+      if (baseSendable.getConditionalRequirements().empty())
+        functionType = functionType->withExtInfo(functionType->getExtInfo().withConcurrent())->getAs<FunctionType>();
+
+      for (auto req : baseSendable.getConditionalRequirements()){
+        if(!TypeChecker::conformsToProtocol( req.getFirstType(), sendableProtocol, useDC->getParentModule()).isInvalid()){
           functionType = functionType->withExtInfo(functionType->getExtInfo().withConcurrent())->getAs<FunctionType>();
+        }
+      }
     }
 
     // FIXME: Verify ExtInfo state is correct, not working by accident.

lib/Sema/TypeCheckConcurrency.cpp

@@ -1938,7 +1938,6 @@ bool swift::diagnoseApplyArgSendability(ApplyExpr *apply, const DeclContext *dec
             isolationCrossing.value().getDiagnoseIsolation()))
       return true;
   }
-
   auto fnType = fnExprType->getAs<FunctionType>();
   if (!fnType)
     return false;
@@ -2468,11 +2467,6 @@ namespace {
         auto valueRef = declRef->getDeclRef();
         auto value = valueRef.getDecl();
         auto loc = declRef->getLoc();
-
-//        for (auto arg : *declRef->getArgs()) {
-////          if (swift::isSendableType(getDeclContext()->getParentModule(), arg))
-//          value->getAttrs().add(new (ctx) SendableAttr(true));
-//        }
 
         //FIXME: Should this be subsumed in reference checking?
         if (value->isLocalCapture())
@@ -2494,12 +2488,6 @@ namespace {
                 partialApply->base, memberRef->first, memberRef->second,
                 partialApply);
 
-            if (diagnosePartialApplySendability(partialApply->fn, partialApply->base, getDeclContext())){
-              if(auto funcdecl = dyn_cast<FuncDecl>(memberRef->first.getDecl())){
-                // Mark with @Sendable attribute implicitly if type is Sendable
-                    funcdecl->getAttrs().add(new (ctx) SendableAttr(true));
-              }
-            }
             partialApply->base->walk(*this);
 
             return Action::SkipChildren(expr);

lib/Sema/TypeCheckConcurrency.h

@@ -548,11 +548,6 @@ bool isPotentiallyIsolatedActor(
     VarDecl *var, llvm::function_ref<bool(ParamDecl *)> isIsolated =
                       [](ParamDecl *P) { return P->isIsolated(); });
 
-/// Check whether the given PartialApplyThunk makes an unsatisfied isolation jump
-/// and if so, emit diagnostics for any nonsendable arguments to the apply.
-/// Add the Sendable attribute if this is a patial apply of a Sendable Type.
-bool diagnosePartialApplySendability(Expr *decl, Expr *base, const DeclContext *declContext);
-
 /// Check whether the given ApplyExpr makes an unsatisfied isolation jump
 /// and if so, emit diagnostics for any nonsendable arguments to the apply
 bool diagnoseApplyArgSendability(