Skip to content

[region-isolation] Ensure that some NDEBUG code is properly guarded. #74911

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 3, 2024
Merged

[region-isolation] Ensure that some NDEBUG code is properly guarded. #74911

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions include/swift/SILOptimizer/Analysis/RegionAnalysis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ namespace regionanalysisimpl {
extern bool AbortOnUnknownPatternMatchError;
#endif

static inline bool shouldAbortOnUnknownPatternMatchError() {
#ifndef NDEBUG
return AbortOnUnknownPatternMatchError;
#else
return false;
#endif
}

using TransferringOperandSetFactory = Partition::TransferringOperandSetFactory;
using Element = PartitionPrimitives::Element;
using Region = PartitionPrimitives::Region;
Expand Down
2 changes: 1 addition & 1 deletion lib/SILOptimizer/Analysis/RegionAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,7 @@ struct PartitionOpBuilder {
}

void addUnknownPatternError(SILValue value) {
if (AbortOnUnknownPatternMatchError) {
if (shouldAbortOnUnknownPatternMatchError()) {
llvm::report_fatal_error(
"RegionIsolation: Aborting on unknown pattern match error");
}
Expand Down
8 changes: 4 additions & 4 deletions lib/SILOptimizer/Mandatory/TransferNonSendable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ class UseAfterTransferDiagnosticEmitter {
}

void emitUnknownPatternError() {
if (AbortOnUnknownPatternMatchError) {
if (shouldAbortOnUnknownPatternMatchError()) {
llvm::report_fatal_error(
"RegionIsolation: Aborting on unknown pattern match error");
}
Expand Down Expand Up @@ -1095,7 +1095,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 (AbortOnUnknownPatternMatchError) {
if (shouldAbortOnUnknownPatternMatchError()) {
llvm::report_fatal_error(
"RegionIsolation: Aborting on unknown pattern match error");
}
Expand Down Expand Up @@ -1158,7 +1158,7 @@ class TransferNonTransferrableDiagnosticEmitter {
}

void emitUnknownPatternError() {
if (AbortOnUnknownPatternMatchError) {
if (shouldAbortOnUnknownPatternMatchError()) {
llvm::report_fatal_error(
"RegionIsolation: Aborting on unknown pattern match error");
}
Expand Down Expand Up @@ -1648,7 +1648,7 @@ struct DiagnosticEvaluator final
}

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