src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp

*** 417,427 ****
  
  void OtherRegionsTable::print_from_card_cache() {
    FromCardCache::print();
  }
  
! void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, int tid) {
    uint cur_hrm_ind = hr()->hrm_index();
  
    if (G1TraceHeapRegionRememberedSet) {
      gclog_or_tty->print_cr("ORT::add_reference_work(" PTR_FORMAT "->" PTR_FORMAT ").",
                                                      from,
--- 417,427 ----
  
  void OtherRegionsTable::print_from_card_cache() {
    FromCardCache::print();
  }
  
! void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, uint tid) {
    uint cur_hrm_ind = hr()->hrm_index();
  
    if (G1TraceHeapRegionRememberedSet) {
      gclog_or_tty->print_cr("ORT::add_reference_work(" PTR_FORMAT "->" PTR_FORMAT ").",
                                                      from,
*** 433,446 ****
    int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift);
  
    if (G1TraceHeapRegionRememberedSet) {
      gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = %d)",
                    hr()->bottom(), from_card,
!                   FromCardCache::at((uint)tid, cur_hrm_ind));
    }
  
!   if (FromCardCache::contains_or_replace((uint)tid, cur_hrm_ind, from_card)) {
      if (G1TraceHeapRegionRememberedSet) {
        gclog_or_tty->print_cr("  from-card cache hit.");
      }
      assert(contains_reference(from), "We just added it!");
      return;
--- 433,446 ----
    int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift);
  
    if (G1TraceHeapRegionRememberedSet) {
      gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = %d)",
                    hr()->bottom(), from_card,
!                   FromCardCache::at(tid, cur_hrm_ind));
    }
  
!   if (FromCardCache::contains_or_replace(tid, cur_hrm_ind, from_card)) {
      if (G1TraceHeapRegionRememberedSet) {
        gclog_or_tty->print_cr("  from-card cache hit.");
      }
      assert(contains_reference(from), "We just added it!");
      return;
*** 491,501 ****
          }
          assert(contains_reference_locked(from), "We just added it!");
          return;
        } else {
          if (G1TraceHeapRegionRememberedSet) {
!           gclog_or_tty->print_cr("   [tid %d] sparse table entry "
                          "overflow(f: %d, t: %u)",
                          tid, from_hrm_ind, cur_hrm_ind);
          }
        }
  
--- 491,501 ----
          }
          assert(contains_reference_locked(from), "We just added it!");
          return;
        } else {
          if (G1TraceHeapRegionRememberedSet) {
!           gclog_or_tty->print_cr("   [tid %u] sparse table entry "
                          "overflow(f: %d, t: %u)",
                          tid, from_hrm_ind, cur_hrm_ind);
          }
        }