Merge pull request swiftlang#35558 from gottesmm/pr-8546814ec14114ba6e9d76c03a8ab15aabc4ad2b

[sil-optimizer] Compile in SIL verifiers when NDEBUG is enabled and enable them only when -sil-verify-all is enabled.

Author: gottesmm

lib/SIL/Verifier/SILVerifier.cpp

@@ -5560,11 +5560,21 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
 //===----------------------------------------------------------------------===//
 
 static bool verificationEnabled(const SILModule &M) {
-#ifdef NDEBUG
-  if (!M.getOptions().VerifyAll)
+  // If we are asked to never verify, return false early.
+  if (M.getOptions().VerifyNone)
     return false;
+
+  // Otherwise, if verify all is set, we always verify.
+  if (M.getOptions().VerifyAll)
+    return true;
+
+#ifndef NDEBUG
+  // Otherwise if we do have asserts enabled, always verify...
+  return true;
+#else
+  // And if we don't never verify.
+  return false;
 #endif
-  return !M.getOptions().VerifyNone;
 }
 
 /// verify - Run the SIL verifier to make sure that the SILFunction follows

test/SILOptimizer/sil_verify_all_triggers_verifier_without_asserts.sil

@@ -0,0 +1,15 @@
+// RUN: not --crash %target-sil-opt -enable-sil-verify-all=true -sil-verify-all=true %s
+// RUN: %target-sil-opt -enable-sil-verify-all=false -sil-verify-all=false %s
+
+// We only run this test without asserts.
+
+// UNSUPPORTED: asserts
+
+class Klass {}
+
+sil [ossa] @leaky_code : $@convention(thin) () -> () {
+bb0:
+  %0 = alloc_ref $Klass
+  %9999 = tuple()
+  return %9999 : $()
+}