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

     1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Tue Jul 01 09:03:55 2014 +0200
     1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Mon Jul 07 10:12:40 2014 +0200
     1.3 @@ -25,6 +25,7 @@
     1.4  #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_HPP
     1.5  #define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_HPP
     1.6  
     1.7 +#include "classfile/javaClasses.hpp"
     1.8  #include "gc_implementation/g1/heapRegionSet.hpp"
     1.9  #include "gc_implementation/shared/gcId.hpp"
    1.10  #include "utilities/taskqueue.hpp"
    1.11 @@ -86,19 +87,19 @@
    1.12    // Return the address corresponding to the next marked bit at or after
    1.13    // "addr", and before "limit", if "limit" is non-NULL.  If there is no
    1.14    // such bit, returns "limit" if that is non-NULL, or else "endWord()".
    1.15 -  HeapWord* getNextMarkedWordAddress(HeapWord* addr,
    1.16 -                                     HeapWord* limit = NULL) const;
    1.17 +  HeapWord* getNextMarkedWordAddress(const HeapWord* addr,
    1.18 +                                     const HeapWord* limit = NULL) const;
    1.19    // Return the address corresponding to the next unmarked bit at or after
    1.20    // "addr", and before "limit", if "limit" is non-NULL.  If there is no
    1.21    // such bit, returns "limit" if that is non-NULL, or else "endWord()".
    1.22 -  HeapWord* getNextUnmarkedWordAddress(HeapWord* addr,
    1.23 -                                       HeapWord* limit = NULL) const;
    1.24 +  HeapWord* getNextUnmarkedWordAddress(const HeapWord* addr,
    1.25 +                                       const HeapWord* limit = NULL) const;
    1.26  
    1.27    // conversion utilities
    1.28    HeapWord* offsetToHeapWord(size_t offset) const {
    1.29      return _bmStartWord + (offset << _shifter);
    1.30    }
    1.31 -  size_t heapWordToOffset(HeapWord* addr) const {
    1.32 +  size_t heapWordToOffset(const HeapWord* addr) const {
    1.33      return pointer_delta(addr, _bmStartWord) >> _shifter;
    1.34    }
    1.35    int heapWordDiffToOffsetDiff(size_t diff) const;
    1.36 @@ -476,6 +477,7 @@
    1.37    ForceOverflowSettings _force_overflow_conc;
    1.38    ForceOverflowSettings _force_overflow_stw;
    1.39  
    1.40 +  void weakRefsWorkParallelPart(BoolObjectClosure* is_alive, bool purged_classes);
    1.41    void weakRefsWork(bool clear_all_soft_refs);
    1.42  
    1.43    void swapMarkBitMaps();