Skip to content

Commit b6b58a2

Browse files
committed
sil-opt: default to -enforce-exclusivity=checked for -diagnostics
1 parent 732b215 commit b6b58a2

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

tools/sil-opt/SILOpt.cpp

+2-7
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ enum EnforceExclusivityMode {
9595
static cl::opt<EnforceExclusivityMode> EnforceExclusivity(
9696
"enforce-exclusivity", cl::desc("Enforce law of exclusivity "
9797
"(and support memory access markers)."),
98-
cl::init(EnforceExclusivityMode::None),
98+
cl::init(EnforceExclusivityMode::Checked),
9999
cl::values(clEnumValN(EnforceExclusivityMode::Unchecked, "unchecked",
100100
"Static checking only."),
101101
clEnumValN(EnforceExclusivityMode::Checked, "checked",
@@ -289,12 +289,7 @@ int main(int argc, char **argv) {
289289
SILOpts.AssumeUnqualifiedOwnershipWhenParsing =
290290
AssumeUnqualifiedOwnershipWhenParsing;
291291

292-
if (EnforceExclusivity.getNumOccurrences() == 0) {
293-
if (SILOpts.Optimization > SILOptions::SILOptMode::None) {
294-
SILOpts.EnforceExclusivityStatic = false;
295-
SILOpts.EnforceExclusivityDynamic = false;
296-
}
297-
} else {
292+
if (EnforceExclusivity.getNumOccurrences() != 0) {
298293
switch (EnforceExclusivity) {
299294
case EnforceExclusivityMode::Unchecked:
300295
// This option is analogous to the -Ounchecked optimization setting.

0 commit comments

Comments
 (0)