Mercurial > hg > truffle

changeset 6788:7c2fd5948145

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author brutisso
date Tue, 25 Sep 2012 18:28:16 +0200
parents 5baec2e69518 (diff) 8966c2d65d96 (current diff)
children 15fba4382765 988bf00cc564
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp	Tue Sep 25 14:58:12 2012 +0200
+++ b/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp	Tue Sep 25 18:28:16 2012 +0200
@@ -129,7 +129,7 @@
   buf.append_and_print_cr("]");
 }
 
-#ifdef ASSERT
+#ifndef PRODUCT
 
 template <class T>
 void WorkerDataArray<T>::reset() {
--- a/src/share/vm/memory/metaspace.cpp	Tue Sep 25 14:58:12 2012 +0200
+++ b/src/share/vm/memory/metaspace.cpp	Tue Sep 25 18:28:16 2012 +0200
@@ -2518,7 +2518,7 @@
                 " waste " SIZE_FORMAT, curr_total, used, free, capacity, waste);
 }
 
-#ifndef PRODUCT
+#ifdef ASSERT
 void SpaceManager::mangle_freed_chunks() {
   for (ChunkIndex index = SmallIndex;
        index < NumberOfFreeLists;
@@ -2536,7 +2536,7 @@
     }
   }
 }
-#endif // PRODUCT
+#endif // ASSERT
 
 
 // MetaspaceAux