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

     1.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp	Thu Mar 29 19:46:24 2012 -0700
     1.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp	Wed Apr 25 09:55:55 2012 -0700
     1.3 @@ -43,7 +43,7 @@
     1.4    // whose position will depend on endian-ness of the platform.
     1.5    // This is so that there is no interference with the
     1.6    // cms_free_bit occupying bit position 7 (lsb == 0)
     1.7 -  // when we are using compressed oops; see FreeChunk::isFree().
     1.8 +  // when we are using compressed oops; see FreeChunk::is_free().
     1.9    // We cannot move the cms_free_bit down because currently
    1.10    // biased locking code assumes that age bits are contiguous
    1.11    // with the lock bits. Even if that assumption were relaxed,
    1.12 @@ -65,7 +65,7 @@
    1.13    };
    1.14   public:
    1.15    inline PromotedObject* next() const {
    1.16 -    assert(!((FreeChunk*)this)->isFree(), "Error");
    1.17 +    assert(!((FreeChunk*)this)->is_free(), "Error");
    1.18      PromotedObject* res;
    1.19      if (UseCompressedOops) {
    1.20        // The next pointer is a compressed oop stored in the top 32 bits
    1.21 @@ -85,27 +85,27 @@
    1.22      } else {
    1.23        _next |= (intptr_t)x;
    1.24      }
    1.25 -    assert(!((FreeChunk*)this)->isFree(), "Error");
    1.26 +    assert(!((FreeChunk*)this)->is_free(), "Error");
    1.27    }
    1.28    inline void setPromotedMark() {
    1.29      _next |= promoted_mask;
    1.30 -    assert(!((FreeChunk*)this)->isFree(), "Error");
    1.31 +    assert(!((FreeChunk*)this)->is_free(), "Error");
    1.32    }
    1.33    inline bool hasPromotedMark() const {
    1.34 -    assert(!((FreeChunk*)this)->isFree(), "Error");
    1.35 +    assert(!((FreeChunk*)this)->is_free(), "Error");
    1.36      return (_next & promoted_mask) == promoted_mask;
    1.37    }
    1.38    inline void setDisplacedMark() {
    1.39      _next |= displaced_mark;
    1.40 -    assert(!((FreeChunk*)this)->isFree(), "Error");
    1.41 +    assert(!((FreeChunk*)this)->is_free(), "Error");
    1.42    }
    1.43    inline bool hasDisplacedMark() const {
    1.44 -    assert(!((FreeChunk*)this)->isFree(), "Error");
    1.45 +    assert(!((FreeChunk*)this)->is_free(), "Error");
    1.46      return (_next & displaced_mark) != 0;
    1.47    }
    1.48 -  inline void clearNext()        {
    1.49 +  inline void clear_next()        {
    1.50      _next = 0;
    1.51 -    assert(!((FreeChunk*)this)->isFree(), "Error");
    1.52 +    assert(!((FreeChunk*)this)->is_free(), "Error");
    1.53    }
    1.54    debug_only(void *next_addr() { return (void *) &_next; })
    1.55  };