Merge pull request #36862 from eeckstein/remove-mv-result-nodes

SIL: remove the sub-classes of MultipleValueInstructionResult

Author: eeckstein

include/swift/SIL/MemAccessUtils.h

@@ -1372,7 +1372,7 @@ class AccessUseDefChainVisitor {
   Result visitGlobalAccess(SILValue global) {
     return asImpl().visitBase(global, AccessedStorage::Global);
   }
-  Result visitYieldAccess(BeginApplyResult *yield) {
+  Result visitYieldAccess(MultipleValueInstructionResult *yield) {
     return asImpl().visitBase(yield, AccessedStorage::Yield);
   }
   Result visitStackAccess(AllocStackInst *stack) {
@@ -1448,8 +1448,10 @@ Result AccessUseDefChainVisitor<Impl, Result>::visit(SILValue sourceAddr) {
 
   // A yield is effectively a nested access, enforced independently in
   // the caller and callee.
-  case ValueKind::BeginApplyResult:
-    return asImpl().visitYieldAccess(cast<BeginApplyResult>(sourceAddr));
+  case ValueKind::MultipleValueInstructionResult:
+    if (auto *baResult = isaResultOf<BeginApplyInst>(sourceAddr))
+      return asImpl().visitYieldAccess(baResult);
+    break;
 
   // A function argument is effectively a nested access, enforced
   // independently in the caller and callee.

include/swift/SIL/OwnershipUtils.h

@@ -894,8 +894,10 @@ class OwnedValueIntroducerKind {
       ;
     case ValueKind::ApplyInst:
       return Kind::Apply;
-    case ValueKind::BeginApplyResult:
-      return Kind::BeginApply;
+    case ValueKind::MultipleValueInstructionResult:
+      if (isaResultOf<BeginApplyInst>(value))
+        return Kind::BeginApply;
+      return Kind::Invalid;
     case ValueKind::StructInst:
       return Kind::Struct;
     case ValueKind::TupleInst:

include/swift/SIL/PatternMatch.h

@@ -411,9 +411,11 @@ template <typename LTy> struct tupleextractoperation_ty {
              L.match((ValueBase *)TEI->getOperand());
     }
 
-    if (auto *DTR = dyn_cast<DestructureTupleResult>(V)) {
-      return DTR->getIndex() == index &&
-             L.match((ValueBase *)DTR->getParent()->getOperand());
+    if (auto *DTR = dyn_cast<MultipleValueInstructionResult>(V)) {
+      if (auto *DT = dyn_cast<DestructureTupleInst>(DTR->getParent())) {
+        return DTR->getIndex() == index &&
+          L.match((ValueBase *)DT->getOperand());
+      }
     }
 
     return false;