Skip to content

Commit 43da5c9

Browse files
committed
Remove dead flag disable-tsan-inout-instrumentation
1 parent 14be78d commit 43da5c9

File tree

4 files changed

+1
-13
lines changed

4 files changed

+1
-13
lines changed

include/swift/Basic/LangOptions.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,6 @@ namespace swift {
225225
/// Enable experimental #assert feature.
226226
bool EnableExperimentalStaticAssert = false;
227227

228-
/// Staging flag for treating inout parameters as Thread Sanitizer
229-
/// accesses.
230-
bool DisableTsanInoutInstrumentation = false;
231-
232228
/// Should we check the target OSs of serialized modules to see that they're
233229
/// new enough?
234230
bool EnableTargetOSChecking = true;

include/swift/Option/FrontendOptions.td

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,6 @@ def disable_availability_checking : Flag<["-"],
349349
"disable-availability-checking">,
350350
HelpText<"Disable checking for potentially unavailable APIs">;
351351

352-
def disable_tsan_inout_instrumentation : Flag<["-"],
353-
"disable-tsan-inout-instrumentation">,
354-
HelpText<"Disable treatment of inout parameters as Thread Sanitizer accesses">;
355-
356352
def report_errors_to_debugger : Flag<["-"], "report-errors-to-debugger">,
357353
HelpText<"Deprecated, will be removed in future versions.">;
358354

lib/Frontend/CompilerInvocation.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
292292
Opts.DisableAvailabilityChecking |=
293293
Args.hasArg(OPT_disable_availability_checking);
294294

295-
Opts.DisableTsanInoutInstrumentation |=
296-
Args.hasArg(OPT_disable_tsan_inout_instrumentation);
297-
298295
if (FrontendOpts.InputKind == InputFileKind::SIL)
299296
Opts.DisableAvailabilityChecking = true;
300297

lib/SILGen/SILGenLValue.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3927,8 +3927,7 @@ static ManagedValue drillIntoComponent(SILGenFunction &SGF,
39273927
bool isRValue = component.isRValue();
39283928
ManagedValue addr = std::move(component).project(SGF, loc, base);
39293929

3930-
if (!SGF.getASTContext().LangOpts.DisableTsanInoutInstrumentation &&
3931-
(SGF.getModule().getOptions().Sanitizers & SanitizerKind::Thread) &&
3930+
if ((SGF.getModule().getOptions().Sanitizers & SanitizerKind::Thread) &&
39323931
tsanKind == TSanKind::InoutAccess && !isRValue) {
39333932
emitTsanInoutAccess(SGF, loc, addr);
39343933
}

0 commit comments

Comments
 (0)