Index: src/Common/Stats/Heap.cc
===================================================================
--- src/Common/Stats/Heap.cc	(revision 462a7c71b73f09a9b66be205a97e657e38d1196c)
+++ src/Common/Stats/Heap.cc	(revision 120a28c324be16903293aacaf7b99c7f3b9c6f84)
@@ -21,6 +21,14 @@
 #include <iostream>
 
-#if defined( NO_STATISTICS ) || defined( TCMALLOC )
-	#define NO_HEAP_STATISTICS
+#if defined(__has_feature)
+	#if __has_feature(address_sanitizer)
+		#define NO_HEAP_STATISTICS
+	# endif
+#endif
+
+#if defined( NO_STATISTICS ) || defined( TCMALLOC ) || defined(__SANITIZE_ADDRESS__)
+	#if !defined(NO_HEAP_STATISTICS)
+		#define NO_HEAP_STATISTICS
+	#endif
 #endif