Merge pull request #75165 from gottesmm/release/6.0-rdar131482934

[6.0][region-isolation] Make "unknown pattern error" always an error.

Author: gottesmm

lib/SILOptimizer/Mandatory/TransferNonSendable.cpp

@@ -157,6 +157,23 @@ static Expr *inferArgumentExprFromApplyExpr(ApplyExpr *sourceApply,
 //                             MARK: Diagnostics
 //===----------------------------------------------------------------------===//
 
+/// Emit the "unknown pattern error" at the SILLocation of \p inst.
+static void diagnoseUnknownPatternError(SILInstruction *inst) {
+  if (shouldAbortOnUnknownPatternMatchError()) {
+    llvm::report_fatal_error(
+        "RegionIsolation: Aborting on unknown pattern match error");
+  }
+
+  auto &ctx = inst->getFunction()->getASTContext();
+  auto loc = inst->getLoc().getSourceLoc();
+
+  ctx.Diags.diagnose(loc, diag::regionbasedisolation_unknown_pattern);
+}
+
+static void diagnoseUnknownPatternError(Operand *op) {
+  diagnoseUnknownPatternError(op->getUser());
+}
+
 template <typename... T, typename... U>
 static InFlightDiagnostic diagnoseError(ASTContext &context, SourceLoc loc,
                                         Diag<T...> diag, U &&...args) {
@@ -731,14 +748,7 @@ class UseAfterTransferDiagnosticEmitter {
   }
 
   void emitUnknownPatternError() {
-    if (shouldAbortOnUnknownPatternMatchError()) {
-      llvm::report_fatal_error(
-          "RegionIsolation: Aborting on unknown pattern match error");
-    }
-
-    diagnoseError(transferOp->getUser(),
-                  diag::regionbasedisolation_unknown_pattern)
-        .limitBehaviorIf(getBehaviorLimit());
+    diagnoseUnknownPatternError(transferOp->getUser());
   }
 
 private:
@@ -1159,12 +1169,7 @@ void TransferNonSendableImpl::emitUseAfterTransferDiagnostics() {
     // tells the user to file a bug. This importantly ensures that we can
     // guarantee that we always find the require if we successfully compile.
     if (!didEmitRequireNote) {
-      if (shouldAbortOnUnknownPatternMatchError()) {
-        llvm::report_fatal_error(
-            "RegionIsolation: Aborting on unknown pattern match error");
-      }
-
-      diagnoseError(transferOp, diag::regionbasedisolation_unknown_pattern);
+      diagnoseUnknownPatternError(transferOp);
       continue;
     }
 
@@ -1226,14 +1231,7 @@ class TransferNonTransferrableDiagnosticEmitter {
   }
 
   void emitUnknownPatternError() {
-    if (shouldAbortOnUnknownPatternMatchError()) {
-      llvm::report_fatal_error(
-          "RegionIsolation: Aborting on unknown pattern match error");
-    }
-
-    diagnoseError(getOperand()->getUser(),
-                  diag::regionbasedisolation_unknown_pattern)
-        .limitBehaviorIf(getBehaviorLimit());
+    diagnoseUnknownPatternError(getOperand()->getUser());
   }
 
   void emitUnknownUse(SILLocation loc) {
@@ -1726,14 +1724,7 @@ class InOutSendingNotDisconnectedDiagnosticEmitter {
   }
 
   void emitUnknownPatternError() {
-    if (shouldAbortOnUnknownPatternMatchError()) {
-      llvm::report_fatal_error(
-          "RegionIsolation: Aborting on unknown pattern match error");
-    }
-
-    diagnoseError(info.functionExitingInst,
-                  diag::regionbasedisolation_unknown_pattern)
-        .limitBehaviorIf(getBehaviorLimit());
+    diagnoseUnknownPatternError(info.functionExitingInst);
   }
 
   void emit();
@@ -1993,13 +1984,7 @@ struct DiagnosticEvaluator final
   }
 
   void handleUnknownCodePattern(const PartitionOp &op) const {
-    if (shouldAbortOnUnknownPatternMatchError()) {
-      llvm::report_fatal_error(
-          "RegionIsolation: Aborting on unknown pattern match error");
-    }
-
-    diagnoseError(op.getSourceInst(),
-                  diag::regionbasedisolation_unknown_pattern);
+    diagnoseUnknownPatternError(op.getSourceInst());
   }
 
   bool isActorDerived(Element element) const {