[region-isolation] Use SILRegionInfo::get to compute actor isolation of non-isolation crossing apply.

Author: gottesmm

lib/SILOptimizer/Analysis/RegionAnalysis.cpp

@@ -1827,21 +1827,6 @@ class PartitionOpTranslator {
   }
 
   void translateNonIsolationCrossingSILApply(FullApplySite fas) {
-    SILIsolationInfo isolationInfo;
-
-    // If self is an actor and we are isolated to it, propagate actor self.
-    if (fas.hasSelfArgument()) {
-      auto &self = fas.getSelfArgumentOperand();
-      if (fas.getArgumentParameterInfo(self).hasOption(
-              SILParameterInfo::Isolated)) {
-        if (auto *nomDecl =
-                self.get()->getType().getNominalOrBoundGenericNominal()) {
-          // First try to see if this nom decl is isolated to an actor.
-          isolationInfo = SILIsolationInfo::getActorIsolated(nomDecl);
-        }
-      }
-    }
-
     // For non-self parameters, gather all of the transferring parameters and
     // gather our non-transferring parameters.
     SmallVector<SILValue, 8> nonTransferringParameters;
@@ -1883,6 +1868,7 @@ class PartitionOpTranslator {
     getApplyResults(*fas, applyResults);
 
     auto type = fas.getSubstCalleeSILType().castTo<SILFunctionType>();
+    auto isolationInfo = SILIsolationInfo::get(*fas);
 
     // If our result is not transferring, just do the normal multi-assign.
     if (!type->hasTransferringResult()) {

lib/SILOptimizer/Utils/PartitionUtils.cpp

@@ -48,6 +48,19 @@ SILIsolationInfo SILIsolationInfo::get(SILInstruction *inst) {
   if (auto fas = FullApplySite::isa(inst)) {
     if (auto crossing = fas.getIsolationCrossing())
       return SILIsolationInfo::getActorIsolated(crossing->getCalleeIsolation());
+
+    if (fas.hasSelfArgument()) {
+      auto &self = fas.getSelfArgumentOperand();
+      if (fas.getArgumentParameterInfo(self).hasOption(
+              SILParameterInfo::Isolated)) {
+        if (auto *nomDecl =
+                self.get()->getType().getNominalOrBoundGenericNominal()) {
+          // TODO: We should be doing this off of the instance... what if we
+          // have two instances of the same class?
+          return SILIsolationInfo::getActorIsolated(nomDecl);
+        }
+      }
+    }
   }
 
   if (auto *pai = dyn_cast<PartialApplyInst>(inst)) {