1.1 --- a/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp Wed Mar 25 15:50:17 2015 +0100
1.2 +++ b/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp Fri Dec 19 09:21:06 2014 +0100
1.3 @@ -67,8 +67,8 @@
1.4
1.5 if (!oopDesc::is_null(heap_oop)) {
1.6 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
1.7 - G1CollectedHeap::in_cset_state_t state = _g1->in_cset_state(obj);
1.8 - if (state == G1CollectedHeap::InCSet) {
1.9 + const InCSetState state = _g1->in_cset_state(obj);
1.10 + if (state.is_in_cset()) {
1.11 // We're not going to even bother checking whether the object is
1.12 // already forwarded or not, as this usually causes an immediate
1.13 // stall. We'll try to prefetch the object (for write, given that
1.14 @@ -87,7 +87,7 @@
1.15
1.16 _par_scan_state->push_on_queue(p);
1.17 } else {
1.18 - if (state == G1CollectedHeap::IsHumongous) {
1.19 + if (state.is_humongous()) {
1.20 _g1->set_humongous_is_live(obj);
1.21 }
1.22 _par_scan_state->update_rs(_from, p, _worker_id);
