[sending] Fix recent alloc_stack as indirect result isolation inference to infer disconnected if the alloc stack is used as a sending indirect result.

I also fixed an issue that I found where we were not substituting SILResultInfo
flags which was causing us to drop when substituting sil_sending. I added a
SILVerifier check to make sure that we do not break this again.

(cherry picked from commit c7124e4)

Author: gottesmm

lib/SIL/IR/SILTypeSubstitution.cpp

@@ -298,7 +298,8 @@ class SILTypeSubstituter :
   }
 
   SILResultInfo substInterface(SILResultInfo orig) {
-    return SILResultInfo(visit(orig.getInterfaceType()), orig.getConvention());
+    return SILResultInfo(visit(orig.getInterfaceType()), orig.getConvention(),
+                         orig.getOptions());
   }
 
   SILYieldInfo substInterface(SILYieldInfo orig) {

lib/SIL/Verifier/SILVerifier.cpp

@@ -1943,6 +1943,13 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
         }
       }
     }
+
+    // Make sure that our subst and orig callee type agree on having sending
+    // results or not.
+    require(site.getOrigCalleeType()->hasSendingResult() ==
+                site.getSubstCalleeType()->hasSendingResult(),
+            "Callee's orig and subst callee type must have the same sending "
+            "result");
   }
 
   void checkApplyInst(ApplyInst *AI) {

lib/SILOptimizer/Analysis/RegionAnalysis.cpp

@@ -1926,10 +1926,10 @@ class PartitionOpTranslator {
                                      isolationInfo);
     }
 
-    // If our result is transferring, then pass in empty as our results and then
-    // perform assign fresh.
+    // If our result is transferring, then pass in empty as our results, no
+    // override isolation, then perform assign fresh.
     ArrayRef<SILValue> empty;
-    translateSILMultiAssign(empty, nonTransferringParameters, isolationInfo);
+    translateSILMultiAssign(empty, nonTransferringParameters, {});
     for (SILValue result : applyResults) {
       if (auto value = tryToTrackValue(result)) {
         builder.addAssignFresh(value->getRepresentative().getValue());

lib/SILOptimizer/Utils/SILIsolationInfo.cpp

@@ -221,6 +221,15 @@ inferIsolationInfoForTempAllocStack(AllocStackInst *asi) {
 
   // Otherwise, lets see if we had a same block indirect result.
   if (state.sameBlockIndirectResultUses) {
+    // Check if this indirect result has a sending result. In such a case, we
+    // always return disconnected.
+    if (auto fas =
+            FullApplySite::isa(state.sameBlockIndirectResultUses->getUser())) {
+      if (fas.getSubstCalleeType()->hasSendingResult())
+        return SILIsolationInfo::getDisconnected(
+            false /*is unsafe non isolated*/);
+    }
+
     // If we do not have any writes in between the alloc stack and the
     // initializer, then we have a good target. Otherwise, we just return
     // AssignFresh.
@@ -338,6 +347,11 @@ inferIsolationInfoForTempAllocStack(AllocStackInst *asi) {
   // At this point, we know that we have a single indirect result use that
   // dominates all writes and other indirect result uses. We can say that our
   // alloc_stack temporary is that indirect result use's isolation.
+  if (auto fas = FullApplySite::isa(targetOperand->getUser())) {
+    if (fas.getSubstCalleeType()->hasSendingResult())
+      return SILIsolationInfo::getDisconnected(
+          false /*is unsafe non isolated*/);
+  }
   return SILIsolationInfo::get(targetOperand->getUser());
 }
 

test/Concurrency/transfernonsendable.sil

@@ -375,3 +375,24 @@ bb0(%0 : @guaranteed $Self):
   return %9999 : $()
 }
 
+sil @closureForCheckedContinuation : $@convention(thin) <τ_0_0> (@in_guaranteed CheckedContinuation<τ_0_0, Never>) -> ()
+sil @withCheckedContinuation : $@convention(thin) @async <τ_0_0> (@sil_isolated @guaranteed Optional<any Actor>, @guaranteed @noescape @callee_guaranteed <τ_0_0> (@in_guaranteed CheckedContinuation<τ_0_0, Never>) -> ()) -> @sil_sending @out τ_0_0
+
+// We shouldn't emit any error here due to sil_sending.
+sil [ossa] @sending_result_from_callee : $@convention(thin) @async () -> () {
+bb0:
+  %0 = alloc_stack $NonSendableKlass
+  %1 = function_ref @closureForCheckedContinuation : $@convention(thin) <τ_0_0> (@in_guaranteed CheckedContinuation<τ_0_0, Never>) -> ()
+  %1a = thin_to_thick_function %1 : $@convention(thin) <τ_0_0> (@in_guaranteed CheckedContinuation<τ_0_0, Never>) -> ()  to $@noescape @callee_guaranteed <τ_0_0> (@in_guaranteed CheckedContinuation<τ_0_0, Never>) -> ()
+  %2 = enum $Optional<any Actor>, #Optional.none!enumelt
+  %3 = function_ref @withCheckedContinuation : $@convention(thin) @async <τ_0_0> (@sil_isolated @guaranteed Optional<any Actor>, @guaranteed @noescape @callee_guaranteed <τ_0_0> (@in_guaranteed CheckedContinuation<τ_0_0, Never>) -> ()) -> @sil_sending @out τ_0_0
+  apply [caller_isolation=nonisolated] [callee_isolation=global_actor] %3<NonSendableKlass>(%0, %2, %1a) : $@convention(thin) @async <τ_0_0> (@sil_isolated @guaranteed Optional<any Actor>, @guaranteed @noescape @callee_guaranteed <τ_0_0> (@in_guaranteed CheckedContinuation<τ_0_0, Never>) -> ()) -> @sil_sending @out τ_0_0
+
+  %f = function_ref @transferIndirect : $@convention(thin) @async <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+  apply [caller_isolation=nonisolated] [callee_isolation=actor_instance] %f<NonSendableKlass>(%0) : $@convention(thin) @async <τ_0_0> (@in_guaranteed τ_0_0) -> ()
+
+  destroy_addr %0 : $*NonSendableKlass
+  dealloc_stack %0 : $*NonSendableKlass
+  %9999 = tuple ()
+  return %9999 : $()
+}