src/hotspot/share/gc/g1/g1OopClosures.inline.hpp

rev 52316 : imported patch 8212911-unify-reference-handling-during-gc
rev 52317 : imported patch 8212911-stefanj-review
rev 52318 : imported patch 8212911-kbarrett-review
rev 52319 : imported patch 8213142-use-raii-to-set-scanning-from-young

*** 82,92 ****
    const InCSetState state = _g1h->in_cset_state(obj);
    if (state.is_in_cset()) {
      prefetch_and_push(p, obj);
    } else if (!HeapRegion::is_in_same_region(p, obj)) {
      handle_non_cset_obj_common(state, p, obj);
!     if (_scanning_in_young) {
        return;
      }
      _par_scan_state->enqueue_card_if_tracked(p, obj);
    }
  }
--- 82,93 ----
    const InCSetState state = _g1h->in_cset_state(obj);
    if (state.is_in_cset()) {
      prefetch_and_push(p, obj);
    } else if (!HeapRegion::is_in_same_region(p, obj)) {
      handle_non_cset_obj_common(state, p, obj);
!     assert(_scanning_in_young != Uninitialized, "Scan location has not been initialized.");
!     if (_scanning_in_young == True) {
        return;
      }
      _par_scan_state->enqueue_card_if_tracked(p, obj);
    }
  }