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

     1.1 --- a/src/share/vm/gc_implementation/g1/g1RemSet.cpp	Tue Apr 23 08:39:55 2013 +0200
     1.2 +++ b/src/share/vm/gc_implementation/g1/g1RemSet.cpp	Thu Apr 18 10:09:23 2013 -0700
     1.3 @@ -169,14 +169,13 @@
     1.4      //   _try_claimed || r->claim_iter()
     1.5      // is true: either we're supposed to work on claimed-but-not-complete
     1.6      // regions, or we successfully claimed the region.
     1.7 -    HeapRegionRemSetIterator* iter = _g1h->rem_set_iterator(_worker_i);
     1.8 -    hrrs->init_iterator(iter);
     1.9 +    HeapRegionRemSetIterator iter(hrrs);
    1.10      size_t card_index;
    1.11  
    1.12      // We claim cards in block so as to recude the contention. The block size is determined by
    1.13      // the G1RSetScanBlockSize parameter.
    1.14      size_t jump_to_card = hrrs->iter_claimed_next(_block_size);
    1.15 -    for (size_t current_card = 0; iter->has_next(card_index); current_card++) {
    1.16 +    for (size_t current_card = 0; iter.has_next(card_index); current_card++) {
    1.17        if (current_card >= jump_to_card + _block_size) {
    1.18          jump_to_card = hrrs->iter_claimed_next(_block_size);
    1.19        }