Enable SIL verification in a more-appropriate way

Author: tbkka

lib/Frontend/CompilerInvocation.cpp

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

lib/SIL/Verifier/SILVerifier.cpp

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