Changeset 800bae1 for src/Common/Stats/Heap.cc

Timestamp:

Jun 17, 2019, 3:37:00 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

54b3fde, 6e55240

Parents:

89faa82 (diff), aba20d2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Common/Stats/Heap.cc (modified) (1 diff)

src/Common/Stats/Heap.cc

@@ -21 +21 @@
 #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