hg: hsx/hotspot-main/hotspot: 2 new changesets

[john.coomes at oracle.com]

Changeset: 537a4053b0f9
Author:    ysr
Date:      2011-05-23 16:42 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/537a4053b0f9

7042740: CMS: assert(n> q) failed: Looping at: ... blockOffsetTable.cpp:557
Summary: Do a one-step look-ahead, when sweeping free or garbage blocks, to avoid overstepping sweep limit, which may become a non-block-boundary because of a heap expansion delta coalescing with a previously co-terminal free block.
Reviewed-by: brutisso, tonyp

! src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp
! src/share/vm/memory/blockOffsetTable.cpp

Changeset: f153114134c8
Author:    jcoomes
Date:      2011-06-07 13:17 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/f153114134c8

Merge