src/share/vm/memory/referenceProcessor.cpp

*** 471,490 ****
  
  void DiscoveredListIterator::load_ptrs(DEBUG_ONLY(bool allow_null_referent)) {
    _discovered_addr = java_lang_ref_Reference::discovered_addr(_ref);
    oop discovered = java_lang_ref_Reference::discovered(_ref);
    assert(_discovered_addr && discovered->is_oop_or_null(),
!          "discovered field is bad");
    _next = discovered;
    _referent_addr = java_lang_ref_Reference::referent_addr(_ref);
    _referent = java_lang_ref_Reference::referent(_ref);
    assert(Universe::heap()->is_in_reserved_or_null(_referent),
           "Wrong oop found in java.lang.Reference object");
    assert(allow_null_referent ?
               _referent->is_oop_or_null()
             : _referent->is_oop(),
!          "bad referent");
  }
  
  void DiscoveredListIterator::remove() {
    assert(_ref->is_oop(), "Dropping a bad reference");
    oop_store_raw(_discovered_addr, NULL);
--- 471,490 ----
  
  void DiscoveredListIterator::load_ptrs(DEBUG_ONLY(bool allow_null_referent)) {
    _discovered_addr = java_lang_ref_Reference::discovered_addr(_ref);
    oop discovered = java_lang_ref_Reference::discovered(_ref);
    assert(_discovered_addr && discovered->is_oop_or_null(),
!          err_msg("discovered field is bad: " PTR_FORMAT, p2i(discovered)));
    _next = discovered;
    _referent_addr = java_lang_ref_Reference::referent_addr(_ref);
    _referent = java_lang_ref_Reference::referent(_ref);
    assert(Universe::heap()->is_in_reserved_or_null(_referent),
           "Wrong oop found in java.lang.Reference object");
    assert(allow_null_referent ?
               _referent->is_oop_or_null()
             : _referent->is_oop(),
!          err_msg("bad referent: " PTR_FORMAT, p2i(_referent)));
  }
  
  void DiscoveredListIterator::remove() {
    assert(_ref->is_oop(), "Dropping a bad reference");
    oop_store_raw(_discovered_addr, NULL);
*** 628,638 ****
      iter.load_ptrs(DEBUG_ONLY(true /* allow_null_referent */));
      HeapWord* next_addr = java_lang_ref_Reference::next_addr(iter.obj());
      oop next = java_lang_ref_Reference::next(iter.obj());
      if ((iter.referent() == NULL || iter.is_referent_alive() ||
           next != NULL)) {
!       assert(next->is_oop_or_null(), "bad next field");
        // Remove Reference object from list
        iter.remove();
        // Trace the cohorts
        iter.make_referent_alive();
        if (UseCompressedOops) {
--- 628,638 ----
      iter.load_ptrs(DEBUG_ONLY(true /* allow_null_referent */));
      HeapWord* next_addr = java_lang_ref_Reference::next_addr(iter.obj());
      oop next = java_lang_ref_Reference::next(iter.obj());
      if ((iter.referent() == NULL || iter.is_referent_alive() ||
           next != NULL)) {
!       assert(next->is_oop_or_null(), err_msg("bad next field: " PTR_FORMAT, p2i(next)));
        // Remove Reference object from list
        iter.remove();
        // Trace the cohorts
        iter.make_referent_alive();
        if (UseCompressedOops) {
*** 977,987 ****
    assert(!discovery_is_atomic(), "Else why call this method?");
    DiscoveredListIterator iter(refs_list, NULL, NULL);
    while (iter.has_next()) {
      iter.load_ptrs(DEBUG_ONLY(true /* allow_null_referent */));
      oop next = java_lang_ref_Reference::next(iter.obj());
!     assert(next->is_oop_or_null(), "bad next field");
      // If referent has been cleared or Reference is not active,
      // drop it.
      if (iter.referent() == NULL || next != NULL) {
        debug_only(
          if (PrintGCDetails && TraceReferenceGC) {
--- 977,987 ----
    assert(!discovery_is_atomic(), "Else why call this method?");
    DiscoveredListIterator iter(refs_list, NULL, NULL);
    while (iter.has_next()) {
      iter.load_ptrs(DEBUG_ONLY(true /* allow_null_referent */));
      oop next = java_lang_ref_Reference::next(iter.obj());
!     assert(next->is_oop_or_null(), err_msg("bad next field: " PTR_FORMAT, p2i(next)));
      // If referent has been cleared or Reference is not active,
      // drop it.
      if (iter.referent() == NULL || next != NULL) {
        debug_only(
          if (PrintGCDetails && TraceReferenceGC) {
*** 1170,1180 ****
  
    ResourceMark rm;      // Needed for tracing.
  
    HeapWord* const discovered_addr = java_lang_ref_Reference::discovered_addr(obj);
    const oop  discovered = java_lang_ref_Reference::discovered(obj);
!   assert(discovered->is_oop_or_null(), "bad discovered field");
    if (discovered != NULL) {
      // The reference has already been discovered...
      if (TraceReferenceGC) {
        gclog_or_tty->print_cr("Already discovered reference (" INTPTR_FORMAT ": %s)",
                               (void *)obj, obj->klass()->internal_name());
--- 1170,1180 ----
  
    ResourceMark rm;      // Needed for tracing.
  
    HeapWord* const discovered_addr = java_lang_ref_Reference::discovered_addr(obj);
    const oop  discovered = java_lang_ref_Reference::discovered(obj);
!   assert(discovered->is_oop_or_null(), err_msg("bad discovered field: " PTR_FORMAT, p2i(discovered)));
    if (discovered != NULL) {
      // The reference has already been discovered...
      if (TraceReferenceGC) {
        gclog_or_tty->print_cr("Already discovered reference (" INTPTR_FORMAT ": %s)",
                               (void *)obj, obj->klass()->internal_name());