Skip to content

Commit 7ea1c9f

Browse files
committed
[Concurrency] Remove the disable-region-based-isolation-with-strict-concurrency
flag. (cherry picked from commit de78fd4)
1 parent 78d1f52 commit 7ea1c9f

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed

include/swift/Option/FrontendOptions.td

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,11 +1352,6 @@ def disable_experimental_parser_round_trip : Flag<["-"],
13521352
"disable-experimental-parser-round-trip">,
13531353
HelpText<"Disable round trip through the new swift parser">;
13541354

1355-
def disable_strict_concurrency_region_based_isolation : Flag<["-"],
1356-
"disable-region-based-isolation-with-strict-concurrency">,
1357-
HelpText<"Disable region based isolation when running with strict concurrency enabled. Only enabled with asserts">,
1358-
Flags<[HelpHidden]>;
1359-
13601355
def disable_transferring_args_and_results_with_region_isolation : Flag<["-"],
13611356
"disable-transferring-args-and-results-with-region-based-isolation">,
13621357
HelpText<"Disable transferring args and results when region based isolation is enabled. Only enabled with asserts">,

lib/DriverTool/sil_opt_main.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -535,10 +535,6 @@ struct SILOptOptions {
535535
"Xcc",
536536
llvm::cl::desc("option to pass to clang"));
537537

538-
llvm::cl::opt<bool> DisableRegionBasedIsolationWithStrictConcurrency =
539-
llvm::cl::opt<bool>(
540-
"disable-region-based-isolation-with-strict-concurrency",
541-
llvm::cl::init(false));
542538
};
543539

544540
/// Regular expression corresponding to the value given in one of the
@@ -706,8 +702,7 @@ int sil_opt_main(ArrayRef<const char *> argv, void *MainAddr) {
706702
if (options.StrictConcurrencyLevel.hasArgStr()) {
707703
Invocation.getLangOptions().StrictConcurrencyLevel =
708704
options.StrictConcurrencyLevel;
709-
if (options.StrictConcurrencyLevel == StrictConcurrency::Complete &&
710-
!options.DisableRegionBasedIsolationWithStrictConcurrency) {
705+
if (options.StrictConcurrencyLevel == StrictConcurrency::Complete) {
711706
Invocation.getLangOptions().enableFeature(Feature::RegionBasedIsolation);
712707
}
713708
}

lib/Frontend/CompilerInvocation.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,16 +1098,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
10981098
if (Opts.StrictConcurrencyLevel == StrictConcurrency::Complete) {
10991099
Opts.enableFeature(Feature::IsolatedDefaultValues);
11001100
Opts.enableFeature(Feature::GlobalConcurrency);
1101-
1102-
// If asserts are enabled, allow for region based isolation to be disabled
1103-
// with a flag. This is intended only to be used with tests.
1104-
bool enableRegionIsolation = true;
1105-
#ifndef NDEBUG
1106-
enableRegionIsolation =
1107-
!Args.hasArg(OPT_disable_strict_concurrency_region_based_isolation);
1108-
#endif
1109-
if (enableRegionIsolation)
1110-
Opts.enableFeature(Feature::RegionBasedIsolation);
1101+
Opts.enableFeature(Feature::RegionBasedIsolation);
11111102
}
11121103

11131104
Opts.WarnImplicitOverrides =

0 commit comments

Comments
 (0)