[region-isolation] Out of an abundance of caution convert isActor -> isAnyActor().

Author: gottesmm

include/swift/SIL/SILType.h

@@ -917,8 +917,16 @@ class SILType {
 
   bool isMarkedAsImmortal() const;
 
+  /// Returns true if this type is an actor type. Returns false if this is any
+  /// other type. This includes distributed actors. To check for distributed
+  /// actors and actors, use isAnyActor().
   bool isActor() const { return getASTType()->isActorType(); }
 
+  bool isDistributedActor() const { return getASTType()->isDistributedActor(); }
+
+  /// Returns true if this type is an actor or a distributed actor.
+  bool isAnyActor() const { return getASTType()->isAnyActorType(); }
+
   /// Returns true if this function conforms to the Sendable protocol.
   bool isSendable(SILFunction *fn) const;
 

include/swift/SILOptimizer/Utils/PartitionUtils.h

@@ -130,7 +130,7 @@ class SILIsolationInfo {
         isolatedValue(isolatedValue), actorInstance(actorInstance) {
     assert((!actorInstance ||
             (actorIsolation.getKind() == ActorIsolation::ActorInstance &&
-             actorInstance->getType().isActor())) &&
+             actorInstance->getType().isAnyActor())) &&
            "actorInstance must be an actor if it is non-empty");
   }
 
@@ -211,7 +211,7 @@ class SILIsolationInfo {
   static SILIsolationInfo getActorIsolated(SILValue isolatedValue,
                                            SILValue actorInstance,
                                            NominalTypeDecl *typeDecl) {
-    if (typeDecl->isActor())
+    if (typeDecl->isAnyActor())
       return {ActorIsolation::forActorInstanceSelf(typeDecl), isolatedValue,
               actorInstance};
     auto isolation = swift::getActorIsolation(typeDecl);

lib/SILOptimizer/Analysis/RegionAnalysis.cpp

@@ -3262,7 +3262,7 @@ TrackableValue RegionAnalysisValueMap::getTrackableValue(
     // underlying object, use that. It is never wrong.
     if (info.actorIsolation) {
       SILValue actorInstance =
-          info.value->getType().isActor() ? info.value : SILValue();
+          info.value->getType().isAnyActor() ? info.value : SILValue();
       iter.first->getSecond().mergeIsolationRegionInfo(
           SILIsolationInfo::getActorIsolated(value, actorInstance,
                                              *info.actorIsolation));

lib/SILOptimizer/Utils/PartitionUtils.cpp

@@ -122,7 +122,7 @@ SILIsolationInfo SILIsolationInfo::get(SILInstruction *inst) {
     auto *nomDecl =
         rei->getOperand()->getType().getNominalOrBoundGenericNominal();
     SILValue actorInstance =
-        nomDecl->isActor() ? rei->getOperand() : SILValue();
+        nomDecl->isAnyActor() ? rei->getOperand() : SILValue();
     return SILIsolationInfo::getActorIsolated(rei, actorInstance, nomDecl);
   }
 
@@ -181,7 +181,7 @@ SILIsolationInfo SILIsolationInfo::get(SILInstruction *inst) {
         if (isolation.isActorIsolated() &&
             (isolation.getKind() != ActorIsolation::ActorInstance ||
              isolation.getActorInstanceParameter() == 0)) {
-          auto actor = cmi->getOperand()->getType().isActor()
+          auto actor = cmi->getOperand()->getType().isAnyActor()
                            ? cmi->getOperand()
                            : SILValue();
           return SILIsolationInfo::getActorIsolated(cmi, actor, isolation);