[region-isolation] Print out SILIsolationInfo's options on all printing routines for SILIsolationInfo.

Before we wouldn't print them in all situations and even more so a few of the
printing routines did not have it at all. This just adds a centralized
SILIsolationInfo::dumpOptions() method and then goes through all of the printing
helpers and changes them to use them as appropriate.

(cherry picked from commit 6129f4e)

Author: gottesmm

include/swift/SILOptimizer/Utils/SILIsolationInfo.h

@@ -142,6 +142,9 @@ class SILIsolationInfo {
     /// If set, this means that this actor isolation is from an isolated
     /// parameter and should be allowed to merge into a self parameter.
     UnappliedIsolatedAnyParameter = 0x2,
+
+    /// The maximum number of bits used by a Flag.
+    MaxNumBits = 2,
   };
 
   using Options = OptionSet<Flag>;
@@ -426,6 +429,9 @@ class SILIsolationInfo {
   bool isEqual(const SILIsolationInfo &other) const;
 
   void Profile(llvm::FoldingSetNodeID &id) const;
+
+private:
+  void printOptions(llvm::raw_ostream &os) const;
 };
 
 /// A SILIsolationInfo that has gone through merging and represents the dynamic

lib/SILOptimizer/Utils/SILIsolationInfo.cpp

@@ -873,39 +873,41 @@ SILIsolationInfo SILIsolationInfo::get(SILArgument *arg) {
   return SILIsolationInfo::getTaskIsolated(fArg);
 }
 
-void SILIsolationInfo::print(llvm::raw_ostream &os) const {
-  auto printOptions = [&] {
-    auto opts = getOptions();
-    if (!opts)
-      return;
+void SILIsolationInfo::printOptions(llvm::raw_ostream &os) const {
+  auto opts = getOptions();
+  if (!opts)
+    return;
 
-    os << ": ";
+  os << ": ";
 
-    std::array<std::pair<Flag, StringLiteral>, 2> data = {
-        std::make_pair(Flag::UnsafeNonIsolated,
-                       StringLiteral("nonisolated(unsafe)")),
-        std::make_pair(Flag::UnappliedIsolatedAnyParameter,
-                       StringLiteral("unapplied_isolated_parameter")),
-    };
+  llvm::SmallVector<StringLiteral, unsigned(Flag::MaxNumBits)> data;
 
-    llvm::interleave(
-        data, os,
-        [&](const std::pair<Flag, StringLiteral> &value) {
-          opts -= value.first;
-          os << value.second;
-        },
-        ", ");
+  if (opts.contains(Flag::UnsafeNonIsolated)) {
+    data.push_back(StringLiteral("nonisolated(unsafe)"));
+    opts -= Flag::UnsafeNonIsolated;
+  }
 
-    assert(!opts && "Unhandled flag?!");
-  };
+  if (opts.contains(Flag::UnappliedIsolatedAnyParameter)) {
+    data.push_back(StringLiteral("unapplied_isolated_any_parameter"));
+    opts -= Flag::UnappliedIsolatedAnyParameter;
+  }
 
+  assert(!opts && "Unhandled flag?!");
+  assert(data.size() < unsigned(Flag::MaxNumBits) &&
+         "Please update MaxNumBits so that we can avoid heap allocations in "
+         "this SmallVector");
+
+  llvm::interleave(data, os, ", ");
+}
+
+void SILIsolationInfo::print(llvm::raw_ostream &os) const {
   switch (Kind(*this)) {
   case Unknown:
     os << "unknown";
     return;
   case Disconnected:
     os << "disconnected";
-    printOptions();
+    printOptions(os);
     return;
   case Actor:
     if (ActorInstance instance = getActorInstance()) {
@@ -914,7 +916,7 @@ void SILIsolationInfo::print(llvm::raw_ostream &os) const {
         SILValue value = instance.getValue();
         if (auto name = VariableNameInferrer::inferName(value)) {
           os << "'" << *name << "'-isolated";
-          printOptions();
+          printOptions(os);
           os << "\n";
           os << "instance: " << *value;
 
@@ -924,7 +926,7 @@ void SILIsolationInfo::print(llvm::raw_ostream &os) const {
       }
       case ActorInstance::Kind::ActorAccessorInit:
         os << "'self'-isolated";
-        printOptions();
+        printOptions(os);
         os << '\n';
         os << "instance: actor accessor init\n";
         return;
@@ -934,17 +936,17 @@ void SILIsolationInfo::print(llvm::raw_ostream &os) const {
     if (getActorIsolation().getKind() == ActorIsolation::ActorInstance) {
       if (auto *vd = getActorIsolation().getActorInstance()) {
         os << "'" << vd->getBaseIdentifier() << "'-isolated";
-        printOptions();
+        printOptions(os);
         return;
       }
     }
 
     getActorIsolation().printForDiagnostics(os);
-    printOptions();
+    printOptions(os);
     return;
   case Task:
     os << "task-isolated";
-    printOptions();
+    printOptions(os);
     os << '\n';
     os << "instance: " << *getIsolatedValue();
     return;
@@ -1071,9 +1073,7 @@ void SILIsolationInfo::printForOneLineLogging(llvm::raw_ostream &os) const {
     return;
   case Disconnected:
     os << "disconnected";
-    if (getOptions().contains(Flag::UnsafeNonIsolated)) {
-      os << ": nonisolated(unsafe)";
-    }
+    printOptions(os);
     return;
   case Actor:
     if (auto instance = getActorInstance()) {
@@ -1082,27 +1082,32 @@ void SILIsolationInfo::printForOneLineLogging(llvm::raw_ostream &os) const {
         SILValue value = instance.getValue();
         if (auto name = VariableNameInferrer::inferName(value)) {
           os << "'" << *name << "'-isolated";
+          printOptions(os);
           return;
         }
         break;
       }
       case ActorInstance::Kind::ActorAccessorInit:
         os << "'self'-isolated";
+        printOptions(os);
         return;
       }
     }
 
     if (getActorIsolation().getKind() == ActorIsolation::ActorInstance) {
       if (auto *vd = getActorIsolation().getActorInstance()) {
         os << "'" << vd->getBaseIdentifier() << "'-isolated";
+        printOptions(os);
         return;
       }
     }
 
     getActorIsolation().printForDiagnostics(os);
+    printOptions(os);
     return;
   case Task:
     os << "task-isolated";
+    printOptions(os);
     return;
   }
 }