@@ -95,7 +95,7 @@ enum EnforceExclusivityMode {
95
95
static cl::opt<EnforceExclusivityMode> EnforceExclusivity (
96
96
" enforce-exclusivity" , cl::desc(" Enforce law of exclusivity "
97
97
" (and support memory access markers)." ),
98
- cl::init(EnforceExclusivityMode::None ),
98
+ cl::init(EnforceExclusivityMode::Checked ),
99
99
cl::values(clEnumValN(EnforceExclusivityMode::Unchecked, " unchecked" ,
100
100
" Static checking only." ),
101
101
clEnumValN(EnforceExclusivityMode::Checked, " checked" ,
@@ -289,12 +289,7 @@ int main(int argc, char **argv) {
289
289
SILOpts.AssumeUnqualifiedOwnershipWhenParsing =
290
290
AssumeUnqualifiedOwnershipWhenParsing;
291
291
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 ) {
298
293
switch (EnforceExclusivity) {
299
294
case EnforceExclusivityMode::Unchecked:
300
295
// This option is analogous to the -Ounchecked optimization setting.
0 commit comments