Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp	Wed Mar 25 10:36:08 2009 -0400
     1.2 +++ b/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp	Wed Mar 25 13:10:54 2009 -0700
     1.3 @@ -65,7 +65,6 @@
     1.4    HeapRegion* to = _g1->heap_region_containing(obj);
     1.5    // The test below could be optimized by applying a bit op to to and from.
     1.6    if (to != NULL && from != NULL && from != to) {
     1.7 -    bool update_delayed = false;
     1.8      // There is a tricky infinite loop if we keep pushing
     1.9      // self forwarding pointers onto our _new_refs list.
    1.10      // The _par_traversal_in_progress flag is true during the collection pause,
    1.11 @@ -77,10 +76,7 @@
    1.12        // or processed (if an evacuation failure occurs) at the end
    1.13        // of the collection.
    1.14        // See HRInto_G1RemSet::cleanup_after_oops_into_collection_set_do().
    1.15 -      update_delayed = true;
    1.16 -    }
    1.17 -
    1.18 -    if (!to->popular() && !update_delayed) {
    1.19 +    } else {
    1.20  #if G1_REM_SET_LOGGING
    1.21        gclog_or_tty->print_cr("Adding " PTR_FORMAT " (" PTR_FORMAT ") to RS"
    1.22                               " for region [" PTR_FORMAT ", " PTR_FORMAT ")",
    1.23 @@ -88,9 +84,7 @@
    1.24                               to->bottom(), to->end());
    1.25  #endif
    1.26        assert(to->rem_set() != NULL, "Need per-region 'into' remsets.");
    1.27 -      if (to->rem_set()->add_reference(p, tid)) {
    1.28 -        _g1->schedule_popular_region_evac(to);
    1.29 -      }
    1.30 +      to->rem_set()->add_reference(p, tid);
    1.31      }
    1.32    }
    1.33  }