commit f52a3e8fc1c75181d4eea89b74b7d7623e97c6a3
author Bengt Rutisson <brutisso@openjdk.org> Tue May 21 08:50:20 2013 +0200
committer Bengt Rutisson <brutisso@openjdk.org> Tue May 21 08:50:20 2013 +0200
tree 966c796c2307df4c72249bef5b757540d5c03961
parent b2539c8d6191b1166c77d1d3fa6fd0c6546a970b

7066063: CMS: "Conservation Principle" assert failed

Add call to coalBirth() in CompactibleFreeListSpace::reset()

Reviewed-by: ysr, jmasa

hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp

diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
index 6ba15a2..b0c9ec8 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
@@ -285,6 +285,7 @@
       _bt.verify_not_unallocated((HeapWord*)fc, fc->size());
       _indexedFreeList[mr.word_size()].return_chunk_at_head(fc);
     }
+    coalBirth(mr.word_size());
   }
   _promoInfo.reset();
   _smallLinearAllocBlock._ptr = NULL;