src/hotspot/share/gc/parallel/psCompactionManager.cpp

rev 50093 : [mq]: pp2_work

*** 198,217 ****
        // treat referent as normal oop
        log_develop_trace(gc, ref)("       Non NULL normal " PTR_FORMAT, p2i(obj));
        cm->mark_and_push(referent_addr);
      }
    }
!   T* next_addr = (T*)java_lang_ref_Reference::next_addr_raw(obj);
!   // Treat discovered as normal oop, if ref is not "active",
!   // i.e. if next is non-NULL.
!   T  next_oop = RawAccess<>::oop_load(next_addr);
!   if (!CompressedOops::is_null(next_oop)) { // i.e. ref is not "active"
      T* discovered_addr = (T*)java_lang_ref_Reference::discovered_addr_raw(obj);
-     log_develop_trace(gc, ref)("   Process discovered as normal " PTR_FORMAT, p2i(discovered_addr));
      cm->mark_and_push(discovered_addr);
-   }
-   cm->mark_and_push(next_addr);
    klass->InstanceKlass::oop_pc_follow_contents(obj, cm);
  }
  
  
  void InstanceRefKlass::oop_pc_follow_contents(oop obj, ParCompactionManager* cm) {
--- 198,210 ----
        // treat referent as normal oop
        log_develop_trace(gc, ref)("       Non NULL normal " PTR_FORMAT, p2i(obj));
        cm->mark_and_push(referent_addr);
      }
    }
!   // Treat discovered as normal oop.
    T* discovered_addr = (T*)java_lang_ref_Reference::discovered_addr_raw(obj);
    cm->mark_and_push(discovered_addr);
    klass->InstanceKlass::oop_pc_follow_contents(obj, cm);
  }
  
  
  void InstanceRefKlass::oop_pc_follow_contents(oop obj, ParCompactionManager* cm) {