# HG changeset patch # User jmasa # Date 1348581955 25200 # Node ID 5baec2e69518c28f03d95478e2077e9c2bbd1372 # Parent 04ed664b7e30a8cc0d007acda3a0856653effc1e 7200615: NPG: optimized VM build is broken Reviewed-by: kvn diff -r 04ed664b7e30 -r 5baec2e69518 src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp --- a/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp Fri Sep 21 14:39:56 2012 -0700 +++ b/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp Tue Sep 25 07:05:55 2012 -0700 @@ -129,7 +129,7 @@ buf.append_and_print_cr("]"); } -#ifdef ASSERT +#ifndef PRODUCT template void WorkerDataArray::reset() { diff -r 04ed664b7e30 -r 5baec2e69518 src/share/vm/memory/metaspace.cpp --- a/src/share/vm/memory/metaspace.cpp Fri Sep 21 14:39:56 2012 -0700 +++ b/src/share/vm/memory/metaspace.cpp Tue Sep 25 07:05:55 2012 -0700 @@ -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