diff --git a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
--- a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
@@ -365,7 +365,7 @@
 
 static cl::opt<bool> ClOptimizeCallbacks("asan-optimize-callbacks",
                                          cl::desc("Optimize callbacks"),
-                                         cl::Hidden, cl::init(false));
+                                         cl::Hidden, cl::init(true));
 
 static cl::opt<bool> ClOptSameTemp(
     "asan-opt-same-temp", cl::desc("Instrument the same temp just once"),