Merge pull request #28993 from gottesmm/pr-cb357f04ae64bfa666fcb2bc03edb404150a00bc

Author: swift-ci

include/swift/SIL/SILInstruction.h

@@ -7000,7 +7000,7 @@ class TermInst : public NonValueInstruction {
   }
 
   using SuccessorBlockArgumentListTy =
-      TransformRange<ConstSuccessorListTy, function_ref<SILPhiArgumentArrayRef(
+      TransformRange<ConstSuccessorListTy, function_ref<ArrayRef<SILArgument *>(
                                                const SILSuccessor &)>>;
 
   /// Return the range of Argument arrays for each successor of this

lib/SIL/OperandOwnership.cpp

@@ -466,16 +466,15 @@ OperandOwnershipKindClassifier::visitSwitchEnumInst(SwitchEnumInst *sei) {
   // and merge them.
   auto mergedKind = ValueOwnershipKind::merge(makeTransformRange(
       sei->getSuccessorBlockArgumentLists(),
-      [&](SILPhiArgumentArrayRef array) -> ValueOwnershipKind {
+      [&](ArrayRef<SILArgument *> array) -> ValueOwnershipKind {
         // If the array is empty, we have a non-payloaded case. Return any.
         if (array.empty())
           return ValueOwnershipKind::None;
 
         // Otherwise, we should have a single element since a payload is
         // a tuple.
         assert(std::distance(array.begin(), array.end()) == 1);
-        SILPhiArgument *arg = array.front();
-        return arg->getOwnershipKind();
+        return array.front()->getOwnershipKind();
       }));
 
   // If we failed to merge, return an empty map so we will fail to pattern match

lib/SIL/SILInstructions.cpp

@@ -1219,9 +1219,9 @@ bool TermInst::isProgramTerminating() const {
 
 TermInst::SuccessorBlockArgumentListTy
 TermInst::getSuccessorBlockArgumentLists() const {
-  function_ref<SILPhiArgumentArrayRef(const SILSuccessor &)> op;
-  op = [](const SILSuccessor &succ) -> SILPhiArgumentArrayRef {
-    return succ.getBB()->getSILPhiArguments();
+  function_ref<ArrayRef<SILArgument *>(const SILSuccessor &)> op;
+  op = [](const SILSuccessor &succ) -> ArrayRef<SILArgument *> {
+    return succ.getBB()->getArguments();
   };
   return SuccessorBlockArgumentListTy(getSuccessors(), op);
 }

lib/SILOptimizer/Mandatory/ClosureLifetimeFixup.cpp

@@ -143,8 +143,8 @@ cleanupDeadTrivialPhiArgs(SILValue initialValue,
   if (ReverseInitialWorklist) {
     std::reverse(insertedPhis.begin(), insertedPhis.end());
   }
-  SmallVector<SILPhiArgument *, 8> worklist(insertedPhis.begin(),
-                                            insertedPhis.end());
+  SmallVector<SILArgument *, 8> worklist(insertedPhis.begin(),
+                                         insertedPhis.end());
   sortUnique(insertedPhis);
   SmallVector<SILValue, 8> incomingValues;
 
@@ -189,7 +189,7 @@ cleanupDeadTrivialPhiArgs(SILValue initialValue,
       auto *termInst = cast<TermInst>(user);
       for (auto succBlockArgList : termInst->getSuccessorBlockArgumentLists()) {
         llvm::copy_if(succBlockArgList, std::back_inserter(worklist),
-                      [&](SILPhiArgument *succArg) -> bool {
+                      [&](SILArgument *succArg) -> bool {
                         auto it = lower_bound(insertedPhis, succArg);
                         return it != insertedPhis.end() && *it == succArg;
                       });

lib/SILOptimizer/Mandatory/PredictableMemOpt.cpp

@@ -935,8 +935,9 @@ static bool
 terminatorHasAnyKnownPhis(TermInst *ti,
                           ArrayRef<SILPhiArgument *> insertedPhiNodesSorted) {
   for (auto succArgList : ti->getSuccessorBlockArgumentLists()) {
-    if (llvm::any_of(succArgList, [&](SILPhiArgument *arg) {
-          return binary_search(insertedPhiNodesSorted, arg);
+    if (llvm::any_of(succArgList, [&](SILArgument *arg) {
+          return binary_search(insertedPhiNodesSorted,
+                               cast<SILPhiArgument>(arg));
         })) {
       return true;
     }