Skip to content

Commit de78fd4

Browse files
committed
[Concurrency] Remove the disable-region-based-isolation-with-strict-concurrency
flag.
1 parent 1a07152 commit de78fd4

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

include/swift/Option/FrontendOptions.td

-5
Original file line numberDiff line numberDiff line change
@@ -1371,11 +1371,6 @@ def disable_experimental_parser_round_trip : Flag<["-"],
13711371
"disable-experimental-parser-round-trip">,
13721372
HelpText<"Disable round trip through the new swift parser">;
13731373

1374-
def disable_strict_concurrency_region_based_isolation : Flag<["-"],
1375-
"disable-region-based-isolation-with-strict-concurrency">,
1376-
HelpText<"Disable region based isolation when running with strict concurrency enabled. Only enabled with asserts">,
1377-
Flags<[HelpHidden]>;
1378-
13791374
def disable_transferring_args_and_results_with_region_isolation : Flag<["-"],
13801375
"disable-transferring-args-and-results-with-region-based-isolation">,
13811376
HelpText<"Disable transferring args and results when region based isolation is enabled. Only enabled with asserts">,

lib/DriverTool/sil_opt_main.cpp

+1-7
Original file line numberDiff line numberDiff line change
@@ -571,11 +571,6 @@ struct SILOptOptions {
571571
"Xcc",
572572
llvm::cl::desc("option to pass to clang"));
573573

574-
llvm::cl::opt<bool> DisableRegionBasedIsolationWithStrictConcurrency =
575-
llvm::cl::opt<bool>(
576-
"disable-region-based-isolation-with-strict-concurrency",
577-
llvm::cl::init(false));
578-
579574
llvm::cl::opt<std::string> SwiftVersionString = llvm::cl::opt<std::string>(
580575
"swift-version",
581576
llvm::cl::desc(
@@ -789,8 +784,7 @@ int sil_opt_main(ArrayRef<const char *> argv, void *MainAddr) {
789784

790785
// If we have strict concurrency set as a feature and were told to turn off
791786
// region based isolation... do so now.
792-
if (Invocation.getLangOptions().hasFeature(Feature::StrictConcurrency) &&
793-
!options.DisableRegionBasedIsolationWithStrictConcurrency) {
787+
if (Invocation.getLangOptions().hasFeature(Feature::StrictConcurrency)) {
794788
Invocation.getLangOptions().enableFeature(Feature::RegionBasedIsolation);
795789
}
796790

lib/Frontend/CompilerInvocation.cpp

+1-10
Original file line numberDiff line numberDiff line change
@@ -1101,16 +1101,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
11011101
if (Opts.StrictConcurrencyLevel == StrictConcurrency::Complete) {
11021102
Opts.enableFeature(Feature::IsolatedDefaultValues);
11031103
Opts.enableFeature(Feature::GlobalConcurrency);
1104-
1105-
// If asserts are enabled, allow for region based isolation to be disabled
1106-
// with a flag. This is intended only to be used with tests.
1107-
bool enableRegionIsolation = true;
1108-
#ifndef NDEBUG
1109-
enableRegionIsolation =
1110-
!Args.hasArg(OPT_disable_strict_concurrency_region_based_isolation);
1111-
#endif
1112-
if (enableRegionIsolation)
1113-
Opts.enableFeature(Feature::RegionBasedIsolation);
1104+
Opts.enableFeature(Feature::RegionBasedIsolation);
11141105
}
11151106

11161107
Opts.WarnImplicitOverrides =

0 commit comments

Comments
 (0)