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

     1.1 --- a/src/share/vm/gc_implementation/g1/sparsePRT.hpp	Thu Oct 14 10:38:14 2010 -0400
     1.2 +++ b/src/share/vm/gc_implementation/g1/sparsePRT.hpp	Fri Oct 15 17:26:56 2010 -0400
     1.3 @@ -169,7 +169,6 @@
     1.4    int _bl_ind;          // [-1, 0.._rsht->_capacity)
     1.5    short _card_ind;      // [0..SparsePRTEntry::cards_num())
     1.6    RSHashTable* _rsht;
     1.7 -  size_t _heap_bot_card_ind;
     1.8  
     1.9    // If the bucket list pointed to by _bl_ind contains a card, sets
    1.10    // _bl_ind to the index of that entry, and returns the card.
    1.11 @@ -183,13 +182,11 @@
    1.12    size_t compute_card_ind(CardIdx_t ci);
    1.13  
    1.14  public:
    1.15 -  RSHashTableIter(size_t heap_bot_card_ind) :
    1.16 +  RSHashTableIter() :
    1.17      _tbl_ind(RSHashTable::NullEntry),
    1.18      _bl_ind(RSHashTable::NullEntry),
    1.19      _card_ind((SparsePRTEntry::cards_num() - 1)),
    1.20 -    _rsht(NULL),
    1.21 -    _heap_bot_card_ind(heap_bot_card_ind)
    1.22 -  {}
    1.23 +    _rsht(NULL) {}
    1.24  
    1.25    void init(RSHashTable* rsht) {
    1.26      _rsht = rsht;
    1.27 @@ -280,19 +277,12 @@
    1.28    bool contains_card(RegionIdx_t region_id, CardIdx_t card_index) const {
    1.29      return _next->contains_card(region_id, card_index);
    1.30    }
    1.31 -
    1.32 -#if 0
    1.33 -  void verify_is_cleared();
    1.34 -  void print();
    1.35 -#endif
    1.36  };
    1.37  
    1.38  
    1.39 -class SparsePRTIter: public /* RSHashTable:: */RSHashTableIter {
    1.40 +class SparsePRTIter: public RSHashTableIter {
    1.41  public:
    1.42 -  SparsePRTIter(size_t heap_bot_card_ind) :
    1.43 -    /* RSHashTable:: */RSHashTableIter(heap_bot_card_ind)
    1.44 -  {}
    1.45 +  SparsePRTIter() : RSHashTableIter() { }
    1.46  
    1.47    void init(const SparsePRT* sprt) {
    1.48      RSHashTableIter::init(sprt->cur());