src/hotspot/share/gc/g1/g1ParScanThreadState.cpp

rev 52211 : imported patch 8212753-improve-forward-to-atomic
rev 52212 : [mq]: 8212753-kbarrett-review

*** 263,273 ****
  
    // We're going to allocate linearly, so might as well prefetch ahead.
    Prefetch::write(obj_ptr, PrefetchCopyIntervalInBytes);
  
    const oop obj = oop(obj_ptr);
!   const oop forward_ptr = old->forward_to_atomic(obj, memory_order_relaxed);
    if (forward_ptr == NULL) {
      Copy::aligned_disjoint_words((HeapWord*) old, obj_ptr, word_sz);
  
      if (dest_state.is_young()) {
        if (age < markOopDesc::max_age) {
--- 263,273 ----
  
    // We're going to allocate linearly, so might as well prefetch ahead.
    Prefetch::write(obj_ptr, PrefetchCopyIntervalInBytes);
  
    const oop obj = oop(obj_ptr);
!   const oop forward_ptr = old->forward_to_atomic(obj, old_mark, memory_order_relaxed);
    if (forward_ptr == NULL) {
      Copy::aligned_disjoint_words((HeapWord*) old, obj_ptr, word_sz);
  
      if (dest_state.is_young()) {
        if (age < markOopDesc::max_age) {
*** 353,363 ****
  }
  
  oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markOop m) {
    assert(_g1h->is_in_cset(old), "Object " PTR_FORMAT " should be in the CSet", p2i(old));
  
!   oop forward_ptr = old->forward_to_atomic(old, memory_order_relaxed);
    if (forward_ptr == NULL) {
      // Forward-to-self succeeded. We are the "owner" of the object.
      HeapRegion* r = _g1h->heap_region_containing(old);
  
      if (!r->evacuation_failed()) {
--- 353,363 ----
  }
  
  oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markOop m) {
    assert(_g1h->is_in_cset(old), "Object " PTR_FORMAT " should be in the CSet", p2i(old));
  
!   oop forward_ptr = old->forward_to_atomic(old, m, memory_order_relaxed);
    if (forward_ptr == NULL) {
      // Forward-to-self succeeded. We are the "owner" of the object.
      HeapRegion* r = _g1h->heap_region_containing(old);
  
      if (!r->evacuation_failed()) {