Skip to content

Commit 18da170

Browse files
authored
Merge pull request #23615 from gottesmm/pr-92f4e0f80f988115829fd8fdfbcc4b6c138869c4
2 parents 7e88424 + f699e0e commit 18da170

File tree

4 files changed

+0
-12
lines changed

4 files changed

+0
-12
lines changed

cmake/modules/SwiftSource.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,6 @@ function(_compile_swift_files
235235
list(APPEND swift_flags "-Xfrontend" "-assume-single-threaded")
236236
endif()
237237

238-
if(SWIFTFILE_IS_STDLIB)
239-
list(APPEND swift_flags "-Xfrontend" "-enable-mandatory-semantic-arc-opts")
240-
endif()
241-
242238
if(NOT SWIFT_ENABLE_STDLIBCORE_EXCLUSIVITY_CHECKING AND SWIFTFILE_IS_STDLIB)
243239
list(APPEND swift_flags "-Xfrontend" "-enforce-exclusivity=unchecked")
244240
endif()

include/swift/AST/SILOptions.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ class SILOptions {
129129
/// Emit extra exclusvity markers for memory access and verify coverage.
130130
bool VerifyExclusivity = false;
131131

132-
/// Enable the mandatory semantic arc optimizer.
133-
bool EnableMandatorySemanticARCOpts = false;
134-
135132
/// Enable large loadable types IRGen pass.
136133
bool EnableLargeLoadableTypes = true;
137134

include/swift/Option/FrontendOptions.td

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,6 @@ def pch_disable_validation : Flag<["-"], "pch-disable-validation">,
302302
def disable_sil_ownership_verifier : Flag<["-"], "disable-sil-ownership-verifier">,
303303
HelpText<"Do not verify ownership invariants during SIL Verification ">;
304304

305-
def enable_mandatory_semantic_arc_opts : Flag<["-"], "enable-mandatory-semantic-arc-opts">,
306-
HelpText<"Enable the mandatory semantic arc optimizer">;
307-
308305
def suppress_static_exclusivity_swap : Flag<["-"], "suppress-static-exclusivity-swap">,
309306
HelpText<"Suppress static violations of exclusive access with swap()">;
310307

lib/Frontend/CompilerInvocation.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,8 +771,6 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
771771
Opts.DisableSILPartialApply |=
772772
Args.hasArg(OPT_disable_sil_partial_apply);
773773
Opts.VerifySILOwnership &= !Args.hasArg(OPT_disable_sil_ownership_verifier);
774-
Opts.EnableMandatorySemanticARCOpts |=
775-
Args.hasArg(OPT_enable_mandatory_semantic_arc_opts);
776774
Opts.EnableLargeLoadableTypes |= Args.hasArg(OPT_enable_large_loadable_types);
777775

778776
if (const Arg *A = Args.getLastArg(OPT_save_optimization_record_path))

0 commit comments

Comments
 (0)