Merge pull request swiftlang#29840 from gottesmm/pr-66121f01ab024ebbc0b7844b0c60f59b8edf59d6

Author: swift-ci

lib/SIL/SILOwnershipVerifier.cpp

@@ -127,6 +127,9 @@ class SILValueOwnershipChecker {
 
 private:
   bool checkUses();
+  bool isCompatibleDefUse(Operand *op, ValueOwnershipKind ownershipKind,
+                          bool isGuaranteed);
+
   bool gatherUsers(SmallVectorImpl<Operand *> &lifetimeEndingUsers,
                    SmallVectorImpl<Operand *> &regularUsers,
                    SmallVectorImpl<Operand *> &implicitRegularUsers);
@@ -184,6 +187,49 @@ bool SILValueOwnershipChecker::check() {
   return result.getValue();
 }
 
+bool SILValueOwnershipChecker::isCompatibleDefUse(
+    Operand *op, ValueOwnershipKind ownershipKind, bool isGuaranteed) {
+  bool isGuaranteedSubValue = false;
+  if (isGuaranteed && isGuaranteedForwardingInst(op->getUser())) {
+    isGuaranteedSubValue = true;
+  }
+  auto *user = op->getUser();
+  auto opOwnershipKindMap = op->getOwnershipKindMap(isGuaranteedSubValue);
+  // If our ownership kind doesn't match, track that we found an error, emit
+  // an error message optionally and then continue.
+  if (opOwnershipKindMap.canAcceptKind(ownershipKind)) {
+    return true;
+  }
+
+  // If we did not support /any/ ownership kind, it means that we found a
+  // conflicting answer so the kind map that was returned is the empty
+  // map. Put out a more specific error here.
+  if (!opOwnershipKindMap.data.any()) {
+    handleError([&]() {
+      llvm::errs() << "Function: '" << user->getFunction()->getName() << "'\n"
+                   << "Ill-formed SIL! Unable to compute ownership kind "
+                      "map for user?!\n"
+                   << "For terminator users, check that successors have "
+                      "compatible ownership kinds.\n"
+                   << "Value: " << op->get() << "User: " << *user
+                   << "Operand Number: " << op->getOperandNumber() << '\n'
+                   << "Conv: " << ownershipKind << "\n\n";
+    });
+    return false;
+  }
+
+  handleError([&]() {
+    llvm::errs() << "Function: '" << user->getFunction()->getName() << "'\n"
+                 << "Have operand with incompatible ownership?!\n"
+                 << "Value: " << op->get() << "User: " << *user
+                 << "Operand Number: " << op->getOperandNumber() << '\n'
+                 << "Conv: " << ownershipKind << '\n'
+                 << "OwnershipMap:\n"
+                 << opOwnershipKindMap << '\n';
+  });
+  return false;
+}
+
 bool SILValueOwnershipChecker::gatherUsers(
     SmallVectorImpl<Operand *> &lifetimeEndingUsers,
     SmallVectorImpl<Operand *> &nonLifetimeEndingUsers,
@@ -214,50 +260,15 @@ bool SILValueOwnershipChecker::gatherUsers(
     if (user->isTypeDependentOperand(*op))
       continue;
 
-    bool isGuaranteedSubValue = false;
-    if (isGuaranteed && isGuaranteedForwardingInst(op->getUser())) {
-      isGuaranteedSubValue = true;
-    }
-
-    auto opOwnershipKindMap = op->getOwnershipKindMap(isGuaranteedSubValue);
-    // If our ownership kind doesn't match, track that we found an error, emit
-    // an error message optionally and then continue.
-    if (!opOwnershipKindMap.canAcceptKind(ownershipKind)) {
+    // First check if this recursive use is compatible with our values ownership
+    // kind. If not, flag the error and continue so that we can report more
+    // errors.
+    if (!isCompatibleDefUse(op, ownershipKind, isGuaranteed)) {
       foundError = true;
-
-      // If we did not support /any/ ownership kind, it means that we found a
-      // conflicting answer so the kind map that was returned is the empty
-      // map. Put out a more specific error here.
-      if (!opOwnershipKindMap.data.any()) {
-        handleError([&]() {
-          llvm::errs() << "Function: '" << user->getFunction()->getName()
-                       << "'\n"
-                       << "Ill-formed SIL! Unable to compute ownership kind "
-                          "map for user?!\n"
-                       << "For terminator users, check that successors have "
-                          "compatible ownership kinds.\n"
-                       << "Value: " << op->get() << "User: " << *user
-                       << "Operand Number: " << op->getOperandNumber() << '\n'
-                       << "Conv: " << ownershipKind << "\n\n";
-        });
-        continue;
-      }
-
-      handleError([&]() {
-        llvm::errs() << "Function: '" << user->getFunction()->getName() << "'\n"
-                     << "Have operand with incompatible ownership?!\n"
-                     << "Value: " << op->get() << "User: " << *user
-                     << "Operand Number: " << op->getOperandNumber() << '\n'
-                     << "Conv: " << ownershipKind << '\n'
-                     << "OwnershipMap:\n"
-                     << opOwnershipKindMap << '\n';
-      });
       continue;
     }
 
-    auto lifetimeConstraint =
-        opOwnershipKindMap.getLifetimeConstraint(ownershipKind);
-    if (lifetimeConstraint == UseLifetimeConstraint::MustBeInvalidated) {
+    if (op->isConsumingUse()) {
       LLVM_DEBUG(llvm::dbgs() << "        Lifetime Ending User: " << *user);
       lifetimeEndingUsers.push_back(op);
     } else {