Index: llvm/trunk/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
===================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
+++ llvm/trunk/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
@@ -155,7 +155,7 @@
 static cl::opt<bool>
     ClInstrumentMemIntrinsics("hwasan-instrument-mem-intrinsics",
                               cl::desc("instrument memory intrinsics"),
-                              cl::Hidden, cl::init(false));
+                              cl::Hidden, cl::init(true));
 namespace {
 
 /// An instrumentation pass implementing detection of addressability bugs
Index: llvm/trunk/test/Instrumentation/HWAddressSanitizer/mem-intrinsics.ll
===================================================================
--- llvm/trunk/test/Instrumentation/HWAddressSanitizer/mem-intrinsics.ll
+++ llvm/trunk/test/Instrumentation/HWAddressSanitizer/mem-intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -hwasan -hwasan-instrument-mem-intrinsics %s | FileCheck %s
+; RUN: opt -S -hwasan %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"