Add InteriorPointer::ProjectBox.

InteriorPointer needs to handle all access base kinds that may be borrowed.

Author: atrick

include/swift/SIL/OwnershipUtils.h

@@ -649,6 +649,7 @@ class InteriorPointerOperandKind {
     RefElementAddr,
     RefTailAddr,
     OpenExistentialBox,
+    ProjectBox,
     StoreBorrow,
   };
 
@@ -676,6 +677,8 @@ class InteriorPointerOperandKind {
       return Kind::RefTailAddr;
     case SILInstructionKind::OpenExistentialBoxInst:
       return Kind::OpenExistentialBox;
+    case SILInstructionKind::ProjectBoxInst:
+      return Kind::ProjectBox;
     case SILInstructionKind::StoreBorrowInst:
       return Kind::StoreBorrow;
     }
@@ -694,6 +697,8 @@ class InteriorPointerOperandKind {
       return Kind::RefTailAddr;
     case ValueKind::OpenExistentialBoxInst:
       return Kind::OpenExistentialBox;
+    case ValueKind::ProjectBoxInst:
+      return Kind::ProjectBox;
     case ValueKind::StoreBorrowInst:
       return Kind::StoreBorrow;
     }
@@ -747,6 +752,7 @@ struct InteriorPointerOperand {
     case InteriorPointerOperandKind::RefElementAddr:
     case InteriorPointerOperandKind::RefTailAddr:
     case InteriorPointerOperandKind::OpenExistentialBox:
+    case InteriorPointerOperandKind::ProjectBox:
     case InteriorPointerOperandKind::StoreBorrow: {
       // Ok, we have a valid instruction. Return the relevant operand.
       auto *op =
@@ -788,6 +794,8 @@ struct InteriorPointerOperand {
       return cast<RefTailAddrInst>(operand->getUser());
     case InteriorPointerOperandKind::OpenExistentialBox:
       return cast<OpenExistentialBoxInst>(operand->getUser());
+    case InteriorPointerOperandKind::ProjectBox:
+      return cast<ProjectBoxInst>(operand->getUser());
     case InteriorPointerOperandKind::StoreBorrow:
       return cast<StoreBorrowInst>(operand->getUser());
     }

lib/SIL/Utils/OwnershipUtils.cpp

@@ -729,7 +729,8 @@ bool InteriorPointerOperand::findTransitiveUsesForAddress(
         isa<BeginAccessInst>(user) || isa<TailAddrInst>(user) ||
         isa<IndexAddrInst>(user) || isa<StoreBorrowInst>(user) ||
         isa<UnconditionalCheckedCastAddrInst>(user) ||
-        isa<UncheckedAddrCastInst>(user)) {
+        isa<UncheckedAddrCastInst>(user)
+        || isa<MarkFunctionEscapeInst>(user)) {
       for (SILValue r : user->getResults()) {
         llvm::copy(r->getUses(), std::back_inserter(worklist));
       }

lib/SILOptimizer/SILCombiner/SILCombinerBuiltinVisitors.cpp

@@ -185,6 +185,7 @@ SILCombiner::optimizeBuiltinCOWBufferForReadingOSSA(BuiltinInst *bi) {
             cast<RefTailAddrInst>(intPtrOperand->getUser())->setImmutable();
             return;
           case InteriorPointerOperandKind::OpenExistentialBox:
+          case InteriorPointerOperandKind::ProjectBox:
           case InteriorPointerOperandKind::StoreBorrow:
             // Can not mark this immutable.
             return;