hg: jdk7/hotspot-gc/hotspot: 7013718: G1: small fixes for two assert/guarantee failures

[tony.printezis at oracle.com]

Changeset: a672e43650cc
Author:    tonyp
Date:      2011-01-21 11:30 -0500
URL:       http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/a672e43650cc

7013718: G1: small fixes for two assert/guarantee failures
Summary: Two small fixes to deal with a guarantee failure (the marking thread should join the SuspendibleThreadSet before calling a method that does pause prediction work so that said method is never called during a pause) and an assert failure (an assert is too strong).
Reviewed-by: iveresov, johnc

! src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
! src/share/vm/gc_implementation/g1/heapRegionSeq.cpp