averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enable SIL verification in a more-appropriate way

Browse Source
This commit is contained in:
Tim Kientzle
2024-10-16 14:41:50 -07:00
parent 4e91aca623
commit c93cd2097c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Frontend/CompilerInvocation.cpp
View File

@@ -2749,7 +2749,6 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
Opts.EnableLifetimeDependenceDiagnostics); Opts.EnableLifetimeDependenceDiagnostics);
Opts.VerifyAll |= Args.hasArg(OPT_sil_verify_all); Opts.VerifyAll |= Args.hasArg(OPT_sil_verify_all);
Opts.VerifyAll |= CONDITIONAL_ASSERT_enabled();
Opts.VerifyNone |= Args.hasArg(OPT_sil_verify_none); Opts.VerifyNone |= Args.hasArg(OPT_sil_verify_none);
Opts.DebugSerialization |= Args.hasArg(OPT_sil_debug_serialization); Opts.DebugSerialization |= Args.hasArg(OPT_sil_debug_serialization);
Opts.EmitVerboseSIL |= Args.hasArg(OPT_emit_verbose_sil); Opts.EmitVerboseSIL |= Args.hasArg(OPT_emit_verbose_sil);
@@ -2770,7 +2769,6 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
Opts.DisableSILPartialApply |= Opts.DisableSILPartialApply |=
Args.hasArg(OPT_disable_sil_partial_apply); Args.hasArg(OPT_disable_sil_partial_apply);
Opts.VerifySILOwnership &= !Args.hasArg(OPT_disable_sil_ownership_verifier); Opts.VerifySILOwnership &= !Args.hasArg(OPT_disable_sil_ownership_verifier);
Opts.VerifySILOwnership |= CONDITIONAL_ASSERT_enabled();
Opts.EnableDynamicReplacementCanCallPreviousImplementation = !Args.hasArg( Opts.EnableDynamicReplacementCanCallPreviousImplementation = !Args.hasArg(
OPT_disable_previous_implementation_calls_in_dynamic_replacements); OPT_disable_previous_implementation_calls_in_dynamic_replacements);
Opts.ParseStdlib = FEOpts.ParseStdlib; Opts.ParseStdlib = FEOpts.ParseStdlib;

4
lib/SIL/Verifier/SILVerifier.cpp
View File

@@ -7330,6 +7330,10 @@ static bool verificationEnabled(const SILModule &M) {
if (M.getOptions().VerifyAll) if (M.getOptions().VerifyAll)
return true; return true;
// If we have asserts enabled, always verify...
if (CONDITIONAL_ASSERT_enabled())
return true;
#ifndef NDEBUG #ifndef NDEBUG
// Otherwise if we do have asserts enabled, always verify... // Otherwise if we do have asserts enabled, always verify...
return true; return true;