Skip to content

[6.0] Revert "[region-isolation] Make "unknown pattern error" always an error #75364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2024
Merged

[6.0] Revert "[region-isolation] Make "unknown pattern error" always an error #75364

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 37 additions & 22 deletions lib/SILOptimizer/Mandatory/TransferNonSendable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,23 +157,6 @@ 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) {
Expand Down Expand Up @@ -748,7 +731,14 @@ class UseAfterTransferDiagnosticEmitter {
}

void emitUnknownPatternError() {
diagnoseUnknownPatternError(transferOp->getUser());
if (shouldAbortOnUnknownPatternMatchError()) {
llvm::report_fatal_error(
"RegionIsolation: Aborting on unknown pattern match error");
}

diagnoseError(transferOp->getUser(),
diag::regionbasedisolation_unknown_pattern)
.limitBehaviorIf(getBehaviorLimit());
}

private:
Expand Down Expand Up @@ -1169,7 +1159,12 @@ 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) {
diagnoseUnknownPatternError(transferOp);
if (shouldAbortOnUnknownPatternMatchError()) {
llvm::report_fatal_error(
"RegionIsolation: Aborting on unknown pattern match error");
}

diagnoseError(transferOp, diag::regionbasedisolation_unknown_pattern);
continue;
}

Expand Down Expand Up @@ -1231,7 +1226,14 @@ class TransferNonTransferrableDiagnosticEmitter {
}

void emitUnknownPatternError() {
diagnoseUnknownPatternError(getOperand()->getUser());
if (shouldAbortOnUnknownPatternMatchError()) {
llvm::report_fatal_error(
"RegionIsolation: Aborting on unknown pattern match error");
}

diagnoseError(getOperand()->getUser(),
diag::regionbasedisolation_unknown_pattern)
.limitBehaviorIf(getBehaviorLimit());
}

void emitUnknownUse(SILLocation loc) {
Expand Down Expand Up @@ -1724,7 +1726,14 @@ class InOutSendingNotDisconnectedDiagnosticEmitter {
}

void emitUnknownPatternError() {
diagnoseUnknownPatternError(info.functionExitingInst);
if (shouldAbortOnUnknownPatternMatchError()) {
llvm::report_fatal_error(
"RegionIsolation: Aborting on unknown pattern match error");
}

diagnoseError(info.functionExitingInst,
diag::regionbasedisolation_unknown_pattern)
.limitBehaviorIf(getBehaviorLimit());
}

void emit();
Expand Down Expand Up @@ -1984,7 +1993,13 @@ struct DiagnosticEvaluator final
}

void handleUnknownCodePattern(const PartitionOp &op) const {
diagnoseUnknownPatternError(op.getSourceInst());
if (shouldAbortOnUnknownPatternMatchError()) {
llvm::report_fatal_error(
"RegionIsolation: Aborting on unknown pattern match error");
}

diagnoseError(op.getSourceInst(),
diag::regionbasedisolation_unknown_pattern);
}

bool isActorDerived(Element element) const {
Expand Down