[NFC] LifetimeCompletion: Lift default a level.

Author: nate-chandler

include/swift/SIL/OSSALifetimeCompletion.h

@@ -97,7 +97,7 @@ class OSSALifetimeCompletion {
   /// TODO: We also need to complete scoped addresses (e.g. store_borrow)!
   LifetimeCompletion
   completeOSSALifetime(SILValue value,
-                       std::optional<Boundary> boundary = std::nullopt) {
+                       std::optional<Boundary> maybeBoundary = std::nullopt) {
     if (value->getOwnershipKind() == OwnershipKind::None)
       return LifetimeCompletion::NoLifetime;
 
@@ -112,6 +112,9 @@ class OSSALifetimeCompletion {
     if (!completedValues.insert(value))
       return LifetimeCompletion::AlreadyComplete;
 
+    Boundary boundary = maybeBoundary.value_or(
+        value->isLexical() ? Boundary::Availability : Boundary::Liveness);
+
     return analyzeAndUpdateLifetime(value, boundary)
                ? LifetimeCompletion::WasCompleted
                : LifetimeCompletion::AlreadyComplete;
@@ -122,8 +125,7 @@ class OSSALifetimeCompletion {
       llvm::function_ref<void(SILInstruction *)> visit);
 
 protected:
-  bool analyzeAndUpdateLifetime(SILValue value,
-                                std::optional<Boundary> boundary);
+  bool analyzeAndUpdateLifetime(SILValue value, Boundary boundary);
 };
 
 //===----------------------------------------------------------------------===//

lib/SIL/Utils/OSSALifetimeCompletion.cpp

@@ -338,8 +338,8 @@ endLifetimeAtAvailabilityBoundary(SILValue value,
 /// End the lifetime of \p value at unreachable instructions.
 ///
 /// Returns true if any new instructions were created to complete the lifetime.
-bool OSSALifetimeCompletion::analyzeAndUpdateLifetime(
-    SILValue value, std::optional<Boundary> maybeBoundary) {
+bool OSSALifetimeCompletion::analyzeAndUpdateLifetime(SILValue value,
+                                                      Boundary boundary) {
   // Called for inner borrows, inner adjacent reborrows, inner reborrows, and
   // scoped addresses.
   auto handleInnerScope = [this](SILValue innerBorrowedValue) {
@@ -348,9 +348,6 @@ bool OSSALifetimeCompletion::analyzeAndUpdateLifetime(
   InteriorLiveness liveness(value);
   liveness.compute(domInfo, handleInnerScope);
 
-  Boundary boundary = maybeBoundary.value_or(
-      value->isLexical() ? Boundary::Availability : Boundary::Liveness);
-
   bool changed = false;
   switch (boundary) {
   case Boundary::Availability: