src/hotspot/share/gc/shared/referenceProcessor.cpp

*** 282,292 ****
    assert(oopDesc::is_oop(_current_discovered), "Dropping a bad reference");
    RawAccess<>::oop_store(_current_discovered_addr, oop(NULL));
  
    // First _prev_next ref actually points into DiscoveredList (gross).
    oop new_next;
!   if (oopDesc::safe_equals(_next_discovered, _current_discovered)) {
      // At the end of the list, we should make _prev point to itself.
      // If _ref is the first ref, then _prev_next will be in the DiscoveredList,
      // and _prev will be NULL.
      new_next = _prev_discovered;
    } else {
--- 282,292 ----
    assert(oopDesc::is_oop(_current_discovered), "Dropping a bad reference");
    RawAccess<>::oop_store(_current_discovered_addr, oop(NULL));
  
    // First _prev_next ref actually points into DiscoveredList (gross).
    oop new_next;
!   if (oopDesc::unsafe_equals(_next_discovered, _current_discovered)) {
      // At the end of the list, we should make _prev point to itself.
      // If _ref is the first ref, then _prev_next will be in the DiscoveredList,
      // and _prev will be NULL.
      new_next = _prev_discovered;
    } else {
*** 472,482 ****
  
  void
  ReferenceProcessor::clear_discovered_references(DiscoveredList& refs_list) {
    oop obj = NULL;
    oop next = refs_list.head();
!   while (! oopDesc::safe_equals(next, obj)) {
      obj = next;
      next = java_lang_ref_Reference::discovered(obj);
      java_lang_ref_Reference::set_discovered_raw(obj, NULL);
    }
    refs_list.clear();
--- 472,482 ----
  
  void
  ReferenceProcessor::clear_discovered_references(DiscoveredList& refs_list) {
    oop obj = NULL;
    oop next = refs_list.head();
!   while (! oopDesc::unsafe_equals(next, obj)) {
      obj = next;
      next = java_lang_ref_Reference::discovered(obj);
      java_lang_ref_Reference::set_discovered_raw(obj, NULL);
    }
    refs_list.clear();
*** 744,754 ****
          }
          ref_lists[to_idx].set_head(move_head);
          ref_lists[to_idx].inc_length(refs_to_move);
  
          // Remove the chain from the from list.
!         if (oopDesc::safe_equals(move_tail, new_head)) {
            // We found the end of the from list.
            ref_lists[from_idx].set_head(NULL);
          } else {
            ref_lists[from_idx].set_head(new_head);
          }
--- 744,754 ----
          }
          ref_lists[to_idx].set_head(move_head);
          ref_lists[to_idx].inc_length(refs_to_move);
  
          // Remove the chain from the from list.
!         if (oopDesc::unsafe_equals(move_tail, new_head)) {
            // We found the end of the from list.
            ref_lists[from_idx].set_head(NULL);
          } else {
            ref_lists[from_idx].set_head(new_head);
          }
*** 1099,1109 ****
  bool ReferenceProcessor::discover_reference(oop obj, ReferenceType rt) {
    // Make sure we are discovering refs (rather than processing discovered refs).
    if (!_discovering_refs || !RegisterReferences) {
      return false;
    }
-   DEBUG_ONLY(BarrierSet::barrier_set()->verify_safe_oop(obj);)
  
    if ((rt == REF_FINAL) && (java_lang_ref_Reference::next(obj) != NULL)) {
      // Don't rediscover non-active FinalReferences.
      return false;
    }
--- 1099,1108 ----