[NFC] OwnedValueCan: Typed maximizeLifetime.

Author: nate-chandler

include/swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h

@@ -185,6 +185,11 @@ enum PruneDebugInsts_t : bool {
   PruneDebugInsts = true,
 };
 
+enum MaximizeLifetime_t : bool {
+  DontMaximizeLifetime = false,
+  MaximizeLifetime = true,
+};
+
 /// Canonicalize OSSA lifetimes.
 ///
 /// Allows the allocation of analysis state to be reused across calls to
@@ -230,7 +235,7 @@ class CanonicalizeOSSALifetime final {
 
   /// If true, lifetimes will not be shortened except when necessary to avoid
   /// copies.
-  bool maximizeLifetime;
+  const MaximizeLifetime_t maximizeLifetime;
 
   // If present, will be used to ensure that the lifetime is not shortened to
   // end inside an access scope which it previously enclosed.  (Note that ending
@@ -318,7 +323,8 @@ class CanonicalizeOSSALifetime final {
   };
 
   CanonicalizeOSSALifetime(PruneDebugInsts_t pruneDebugMode,
-                           bool maximizeLifetime, SILFunction *function,
+                           MaximizeLifetime_t maximizeLifetime,
+                           SILFunction *function,
                            NonLocalAccessBlockAnalysis *accessBlockAnalysis,
                            DominanceInfo *domTree,
                            BasicCalleeAnalysis *calleeAnalysis,

lib/SILOptimizer/Mandatory/MoveOnlyObjectCheckerUtils.h

@@ -49,7 +49,7 @@ struct OSSACanonicalizer {
   OSSACanonicalizer(SILFunction *fn, DominanceInfo *domTree,
                     InstructionDeleter &deleter)
       : canonicalizer(DontPruneDebugInsts,
-                      !fn->shouldOptimize() /*maximizeLifetime*/, fn,
+                      MaximizeLifetime_t(!fn->shouldOptimize()), fn,
                       nullptr /*accessBlockAnalysis*/, domTree,
                       nullptr /*calleeAnalysis*/, deleter) {}
 

lib/SILOptimizer/SILCombiner/SILCombine.cpp

@@ -352,7 +352,7 @@ void SILCombiner::canonicalizeOSSALifetimes(SILInstruction *currentInst) {
   DominanceInfo *domTree = DA->get(&Builder.getFunction());
   CanonicalizeOSSALifetime canonicalizer(
       DontPruneDebugInsts,
-      !parentTransform->getFunction()->shouldOptimize() /*maximize lifetime*/,
+      MaximizeLifetime_t(!parentTransform->getFunction()->shouldOptimize()),
       parentTransform->getFunction(), NLABA, domTree, CA, deleter);
   CanonicalizeBorrowScope borrowCanonicalizer(parentTransform->getFunction(),
                                               deleter);

lib/SILOptimizer/Transforms/CopyPropagation.cpp

@@ -493,7 +493,7 @@ void CopyPropagation::run() {
   // canonicalizer performs all modifications through deleter's callbacks, so we
   // don't need to explicitly check for changes.
   CanonicalizeOSSALifetime canonicalizer(
-      pruneDebug, /*maximizeLifetime=*/!getFunction()->shouldOptimize(),
+      pruneDebug, MaximizeLifetime_t(!getFunction()->shouldOptimize()),
       getFunction(), accessBlockAnalysis, domTree, calleeAnalysis, deleter);
   // NOTE: We assume that the function is in reverse post order so visiting the
   //       blocks and pushing begin_borrows as we see them and then popping them

lib/SILOptimizer/Transforms/SILMem2Reg.cpp

@@ -2070,7 +2070,7 @@ void MemoryToRegisters::canonicalizeValueLifetimes(
     }
   }
   CanonicalizeOSSALifetime canonicalizer(
-      PruneDebugInsts, /*maximizeLifetime=*/!f.shouldOptimize(), &f,
+      PruneDebugInsts, MaximizeLifetime_t(!f.shouldOptimize()), &f,
       accessBlockAnalysis, domInfo, calleeAnalysis, deleter);
   for (auto value : owned) {
     if (isa<SILUndef>(value) || value->isMarkedAsDeleted())

lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp

@@ -1253,7 +1253,7 @@ static FunctionTest CanonicalizeOSSALifetimeTest(
       DominanceInfo *domTree = dominanceAnalysis->get(&function);
       auto *calleeAnalysis = test.template getAnalysis<BasicCalleeAnalysis>();
       auto pruneDebug = PruneDebugInsts_t(arguments.takeBool());
-      auto maximizeLifetimes = arguments.takeBool();
+      auto maximizeLifetimes = MaximizeLifetime_t(arguments.takeBool());
       auto respectAccessScopes = arguments.takeBool();
       InstructionDeleter deleter;
       CanonicalizeOSSALifetime canonicalizer(