diff --git a/llvm/lib/Passes/StandardInstrumentations.cpp b/llvm/lib/Passes/StandardInstrumentations.cpp
--- a/llvm/lib/Passes/StandardInstrumentations.cpp
+++ b/llvm/lib/Passes/StandardInstrumentations.cpp
@@ -44,10 +44,10 @@
 using namespace llvm;
 
 static cl::opt<bool> VerifyPreservedCFG("verify-cfg-preserved", cl::Hidden,
-#ifdef NDEBUG
-                                        cl::init(false)
-#else
+#ifdef EXPENSIVE_CHECKS
                                         cl::init(true)
+#else
+                                        cl::init(false)
 #endif
 );