diff --git a/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
--- a/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
@@ -115,7 +115,7 @@
                                        cl::Hidden, cl::init(true));
 
 static cl::opt<bool>
-    ClUseStackSafety("hwasan-use-stack-safety", cl::Hidden, cl::init(true),
+    ClUseStackSafety("hwasan-use-stack-safety", cl::Hidden, cl::init(false),
                      cl::Hidden, cl::desc("Use Stack Safety analysis results"),
                      cl::Optional);