[silgen] Make NormalCaseHandler and DefaultCaseHandler take SwitchCaseFullExpr as movable rvalues.

This fits more with the notion of the API, that the user is being given a scope
that was already setup for them and that they must decide when to pop.

Author: gottesmm

lib/SILGen/SILGenConvert.cpp

@@ -393,7 +393,7 @@ SILGenFunction::emitOptionalToOptional(SILLocation loc,
 
   SEBuilder.addCase(
       getASTContext().getOptionalSomeDecl(), isPresentBB, contBB,
-      [&](ManagedValue input, SwitchCaseFullExpr &scope) {
+      [&](ManagedValue input, SwitchCaseFullExpr &&scope) {
         // If we have an address only type, we want to match the old behavior of
         // transforming the underlying type instead of the optional type. This
         // ensures that we use the more efficient non-generic code paths when
@@ -422,7 +422,7 @@ SILGenFunction::emitOptionalToOptional(SILLocation loc,
 
   SEBuilder.addCase(
       getASTContext().getOptionalNoneDecl(), isNotPresentBB, contBB,
-      [&](ManagedValue input, SwitchCaseFullExpr &scope) {
+      [&](ManagedValue input, SwitchCaseFullExpr &&scope) {
         if (!(resultTL.isAddressOnly() && silConv.useLoweredAddresses())) {
           SILValue none =
               B.createManagedOptionalNone(loc, resultTy).forward(*this);

lib/SILGen/SILGenDecl.cpp

@@ -779,7 +779,7 @@ void EnumElementPatternInitialization::emitEnumMatch(
   // path, causing a use (the destroy on the negative path) to be created that
   // does not dominate its definition (in the positive path).
   auto handler = [&SGF, &loc, &failureDest](ManagedValue mv,
-                                            SwitchCaseFullExpr &expr) {
+                                            SwitchCaseFullExpr &&expr) {
     expr.exit();
     SGF.Cleanups.emitBranchAndCleanups(failureDest, loc);
   };
@@ -804,7 +804,7 @@ void EnumElementPatternInitialization::emitEnumMatch(
   switchBuilder.addCase(
       eltDecl, someBlock, contBlock,
       [&SGF, &loc, &eltDecl, &subInit, &value](ManagedValue mv,
-                                               SwitchCaseFullExpr &expr) {
+                                               SwitchCaseFullExpr &&expr) {
         // If the enum case has no bound value, we're done.
         if (!eltDecl->hasAssociatedValues()) {
           assert(

lib/SILGen/SILGenExpr.cpp

@@ -4255,7 +4255,7 @@ static ManagedValue flattenOptional(SILGenFunction &SGF, SILLocation loc,
 
   auto *someDecl = SGF.getASTContext().getOptionalSomeDecl();
   SEB.addCase(someDecl, isPresentBB, contBB, [&](ManagedValue input,
-                                                 SwitchCaseFullExpr &scope) {
+                                                 SwitchCaseFullExpr &&scope) {
     if (resultTL.isAddressOnly()) {
       SILValue addr =
           addrOnlyResultBuf->getAddressForInPlaceInitialization(SGF, loc);
@@ -4270,7 +4270,7 @@ static ManagedValue flattenOptional(SILGenFunction &SGF, SILLocation loc,
   });
   SEB.addCase(
       SGF.getASTContext().getOptionalNoneDecl(), isNotPresentBB, contBB,
-      [&](ManagedValue input, SwitchCaseFullExpr &scope) {
+      [&](ManagedValue input, SwitchCaseFullExpr &&scope) {
         if (resultTL.isAddressOnly()) {
           SILValue addr =
               addrOnlyResultBuf->getAddressForInPlaceInitialization(SGF, loc);

lib/SILGen/SILGenStmt.cpp

@@ -819,7 +819,7 @@ void StmtEmitter::visitForEachStmt(ForEachStmt *S) {
   switchEnumBuilder.addCase(
       SGF.getASTContext().getOptionalSomeDecl(), createBasicBlock(),
       loopDest.getBlock(),
-      [&](ManagedValue inputValue, SwitchCaseFullExpr &scope) {
+      [&](ManagedValue inputValue, SwitchCaseFullExpr &&scope) {
         SGF.emitProfilerIncrement(S->getBody());
 
         // Emit the loop body.
@@ -884,7 +884,7 @@ void StmtEmitter::visitForEachStmt(ForEachStmt *S) {
   switchEnumBuilder.addCase(
       SGF.getASTContext().getOptionalNoneDecl(), createBasicBlock(),
       failExitingBlock,
-      [&](ManagedValue inputValue, SwitchCaseFullExpr &scope) {
+      [&](ManagedValue inputValue, SwitchCaseFullExpr &&scope) {
         assert(!inputValue && "None should not be passed an argument!");
         scope.exitAndBranch(S);
       },

lib/SILGen/SwitchEnumBuilder.cpp

@@ -105,7 +105,7 @@ void SwitchEnumBuilder::emit() && {
     if (!isAddressOnly) {
       input = builder.createOwnedPHIArgument(optional.getType());
     }
-    handler(input, presentScope);
+    handler(input, std::move(presentScope));
     builder.clearInsertionPoint();
   }
 
@@ -132,7 +132,7 @@ void SwitchEnumBuilder::emit() && {
         input = builder.createOwnedPHIArgument(inputType);
       }
     }
-    handler(input, presentScope);
+    handler(input, std::move(presentScope));
     builder.clearInsertionPoint();
   }
 
@@ -153,7 +153,7 @@ void SwitchEnumBuilder::emit() && {
     if (!isAddressOnly) {
       input = builder.createOwnedPHIArgument(optional.getType());
     }
-    handler(input, presentScope);
+    handler(input, std::move(presentScope));
     builder.clearInsertionPoint();
   }
 }

lib/SILGen/SwitchEnumBuilder.h

@@ -58,9 +58,9 @@ class SwitchCaseFullExpr {
 class SwitchEnumBuilder {
 public:
   using NormalCaseHandler =
-      std::function<void(ManagedValue, SwitchCaseFullExpr &)>;
+      std::function<void(ManagedValue, SwitchCaseFullExpr &&)>;
   using DefaultCaseHandler =
-      std::function<void(ManagedValue, SwitchCaseFullExpr &)>;
+      std::function<void(ManagedValue, SwitchCaseFullExpr &&)>;
 
   enum class DefaultDispatchTime { BeforeNormalCases, AfterNormalCases };