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

*** 435,456 ****
  
  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("Expected an oop or NULL for discovered field at " 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("Expected an oop%s for referent field at " PTR_FORMAT,
                   (allow_null_referent ? " or NULL" : ""),
!                  p2i(_referent)));
  }
  
  void DiscoveredListIterator::remove() {
    assert(_ref->is_oop(), "Dropping a bad reference");
    oop_store_raw(_discovered_addr, NULL);
--- 435,456 ----
  
  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(),
!          "Expected an oop or NULL for discovered field at " 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(),
!          "Expected an oop%s for referent field at " PTR_FORMAT,
           (allow_null_referent ? " or NULL" : ""),
!          p2i(_referent));
  }
  
  void DiscoveredListIterator::remove() {
    assert(_ref->is_oop(), "Dropping a bad reference");
    oop_store_raw(_discovered_addr, NULL);
*** 576,586 ****
      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("Expected an oop or NULL for next field at " PTR_FORMAT, p2i(next)));
        // Remove Reference object from list
        iter.remove();
        // Trace the cohorts
        iter.make_referent_alive();
        if (UseCompressedOops) {
--- 576,586 ----
      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(), "Expected an oop or NULL for next field at " PTR_FORMAT, p2i(next));
        // Remove Reference object from list
        iter.remove();
        // Trace the cohorts
        iter.make_referent_alive();
        if (UseCompressedOops) {
*** 991,1003 ****
  // cleared concurrently by mutators during (or after) discovery.
  void ReferenceProcessor::verify_referent(oop obj) {
    bool da = discovery_is_atomic();
    oop referent = java_lang_ref_Reference::referent(obj);
    assert(da ? referent->is_oop() : referent->is_oop_or_null(),
!          err_msg("Bad referent " INTPTR_FORMAT " found in Reference "
                   INTPTR_FORMAT " during %satomic discovery ",
!                  p2i(referent), p2i(obj), da ? "" : "non-"));
  }
  #endif
  
  // We mention two of several possible choices here:
  // #0: if the reference object is not in the "originating generation"
--- 991,1003 ----
  // cleared concurrently by mutators during (or after) discovery.
  void ReferenceProcessor::verify_referent(oop obj) {
    bool da = discovery_is_atomic();
    oop referent = java_lang_ref_Reference::referent(obj);
    assert(da ? referent->is_oop() : referent->is_oop_or_null(),
!          "Bad referent " INTPTR_FORMAT " found in Reference "
           INTPTR_FORMAT " during %satomic discovery ",
!          p2i(referent), p2i(obj), da ? "" : "non-");
  }
  #endif
  
  // We mention two of several possible choices here:
  // #0: if the reference object is not in the "originating generation"
*** 1068,1078 ****
  
    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("Expected an oop or NULL for discovered field at " 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)",
                               p2i(obj), obj->klass()->internal_name());
--- 1068,1078 ----
  
    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(), "Expected an oop or NULL for discovered field at " 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)",
                               p2i(obj), obj->klass()->internal_name());