[silgen] Add helper methods to SwitchEnumBuilder for creating .Some, .None cases.

I also used it to clean up a few uses of SwitchEnumBuilder.

Author: gottesmm

lib/SILGen/SILGenConvert.cpp

@@ -391,9 +391,8 @@ SILGenFunction::emitOptionalToOptional(SILLocation loc,
     finalResult = B.createOwnedPHIArgument(resultTL.getLoweredType());
   }
 
-  SEBuilder.addCase(
-      getASTContext().getOptionalSomeDecl(), isPresentBB, contBB,
-      [&](ManagedValue input, SwitchCaseFullExpr &&scope) {
+  SEBuilder.addOptionalSomeCase(
+      isPresentBB, contBB, [&](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
@@ -420,8 +419,8 @@ SILGenFunction::emitOptionalToOptional(SILLocation loc,
         return scope.exitAndBranch(loc);
       });
 
-  SEBuilder.addCase(
-      getASTContext().getOptionalNoneDecl(), isNotPresentBB, contBB,
+  SEBuilder.addOptionalNoneCase(
+      isNotPresentBB, contBB,
       [&](ManagedValue input, SwitchCaseFullExpr &&scope) {
         if (!(resultTL.isAddressOnly() && silConv.useLoweredAddresses())) {
           SILValue none =

lib/SILGen/SILGenExpr.cpp

@@ -4253,23 +4253,23 @@ static ManagedValue flattenOptional(SILGenFunction &SGF, SILLocation loc,
 
   SwitchEnumBuilder SEB(SGF.B, loc, optVal);
 
-  auto *someDecl = SGF.getASTContext().getOptionalSomeDecl();
-  SEB.addCase(someDecl, isPresentBB, contBB, [&](ManagedValue input,
-                                                 SwitchCaseFullExpr &&scope) {
-    if (resultTL.isAddressOnly()) {
-      SILValue addr =
-          addrOnlyResultBuf->getAddressForInPlaceInitialization(SGF, loc);
-      input = SGF.B.createUncheckedTakeEnumDataAddr(
-          loc, input, someDecl, input.getType().getOptionalObjectType());
-      SGF.B.createCopyAddr(loc, input.getValue(), addr, IsNotTake,
-                           IsInitialization);
-      scope.exitAndBranch(loc);
-      return;
-    }
-    scope.exitAndBranch(loc, input.forward(SGF));
-  });
-  SEB.addCase(
-      SGF.getASTContext().getOptionalNoneDecl(), isNotPresentBB, contBB,
+  SEB.addOptionalSomeCase(
+      isPresentBB, contBB, [&](ManagedValue input, SwitchCaseFullExpr &&scope) {
+        if (resultTL.isAddressOnly()) {
+          SILValue addr =
+              addrOnlyResultBuf->getAddressForInPlaceInitialization(SGF, loc);
+          auto *someDecl = SGF.getASTContext().getOptionalSomeDecl();
+          input = SGF.B.createUncheckedTakeEnumDataAddr(
+              loc, input, someDecl, input.getType().getOptionalObjectType());
+          SGF.B.createCopyAddr(loc, input.getValue(), addr, IsNotTake,
+                               IsInitialization);
+          scope.exitAndBranch(loc);
+          return;
+        }
+        scope.exitAndBranch(loc, input.forward(SGF));
+      });
+  SEB.addOptionalNoneCase(
+      isNotPresentBB, contBB,
       [&](ManagedValue input, SwitchCaseFullExpr &&scope) {
         if (resultTL.isAddressOnly()) {
           SILValue addr =

lib/SILGen/SILGenStmt.cpp

@@ -816,9 +816,8 @@ void StmtEmitter::visitForEachStmt(ForEachStmt *S) {
   SILBasicBlock *failExitingBlock = createBasicBlock();
   SwitchEnumBuilder switchEnumBuilder(SGF.B, S, nextBufOrValue);
 
-  switchEnumBuilder.addCase(
-      SGF.getASTContext().getOptionalSomeDecl(), createBasicBlock(),
-      loopDest.getBlock(),
+  switchEnumBuilder.addOptionalSomeCase(
+      createBasicBlock(), loopDest.getBlock(),
       [&](ManagedValue inputValue, SwitchCaseFullExpr &&scope) {
         SGF.emitProfilerIncrement(S->getBody());
 
@@ -881,9 +880,8 @@ void StmtEmitter::visitForEachStmt(ForEachStmt *S) {
   // We add loop fail block, just to be defensive about intermediate
   // transformations performing cleanups at scope.exit(). We still jump to the
   // contBlock.
-  switchEnumBuilder.addCase(
-      SGF.getASTContext().getOptionalNoneDecl(), createBasicBlock(),
-      failExitingBlock,
+  switchEnumBuilder.addOptionalNoneCase(
+      createBasicBlock(), failExitingBlock,
       [&](ManagedValue inputValue, SwitchCaseFullExpr &&scope) {
         assert(!inputValue && "None should not be passed an argument!");
         scope.exitAndBranch(S);

lib/SILGen/SwitchEnumBuilder.h

@@ -121,6 +121,38 @@ class SwitchEnumBuilder {
     caseDataArray.emplace_back(decl, caseBlock, contBlock, handle, count);
   }
 
+  void addOptionalSomeCase(SILBasicBlock *caseBlock) {
+    auto *decl = getSGF().getASTContext().getOptionalSomeDecl();
+    caseDataArray.emplace_back(
+        decl, caseBlock, nullptr,
+        [](ManagedValue mv, SwitchCaseFullExpr &&expr) { expr.exit(); },
+        ProfileCounter());
+  }
+
+  void addOptionalNoneCase(SILBasicBlock *caseBlock) {
+    auto *decl = getSGF().getASTContext().getOptionalNoneDecl();
+    caseDataArray.emplace_back(
+        decl, caseBlock, nullptr,
+        [](ManagedValue mv, SwitchCaseFullExpr &&expr) { expr.exit(); },
+        ProfileCounter());
+  }
+
+  void addOptionalSomeCase(SILBasicBlock *caseBlock,
+                           NullablePtr<SILBasicBlock> contBlock,
+                           NormalCaseHandler handle,
+                           ProfileCounter count = ProfileCounter()) {
+    auto *decl = getSGF().getASTContext().getOptionalSomeDecl();
+    caseDataArray.emplace_back(decl, caseBlock, contBlock, handle, count);
+  }
+
+  void addOptionalNoneCase(SILBasicBlock *caseBlock,
+                           NullablePtr<SILBasicBlock> contBlock,
+                           NormalCaseHandler handle,
+                           ProfileCounter count = ProfileCounter()) {
+    auto *decl = getSGF().getASTContext().getOptionalNoneDecl();
+    caseDataArray.emplace_back(decl, caseBlock, contBlock, handle, count);
+  }
+
   void emit() &&;
 
 private: