hg: jdk7/hotspot-gc/hotspot: 2 new changesets

[john.cuthbertson at oracle.com]

Changeset: 878b57474103
Author:    johnc
Date:      2010-11-16 14:07 -0800
URL:       http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/878b57474103

6978187: G1: assert(ParallelGCThreads>  1 || n_yielded() == _hrrs->occupied()) strikes again
Summary: An evacuation failure while copying the roots caused an object, A, to be forwarded to itself. During the subsequent RSet updating a reference to A was processed causing the reference to be added to the RSet of A's heap region. As a result of adding to the remembered set we ran into the issue described in 6930581 - the sparse table expanded and the RSet scanning code walked the cards in one instance of RHashTable (_cur) while the occupied() counts the cards in the expanded table (_next).
Reviewed-by: tonyp, iveresov

! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
! src/share/vm/gc_implementation/g1/g1RemSet.cpp
! src/share/vm/gc_implementation/g1/g1RemSet.hpp
! src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp

Changeset: deef066c3622
Author:    johnc
Date:      2010-11-16 16:12 -0800
URL:       http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/deef066c3622

Merge