Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/memory/space.hpp	Fri May 04 15:26:05 2012 -0700
     1.2 +++ b/src/share/vm/memory/space.hpp	Thu May 10 11:27:10 2012 +0200
     1.3 @@ -880,10 +880,17 @@
     1.4    void object_iterate_mem(MemRegion mr, UpwardsObjectClosure* cl);
     1.5    // iterates on objects up to the safe limit
     1.6    HeapWord* object_iterate_careful(ObjectClosureCareful* cl);
     1.7 -  inline HeapWord* concurrent_iteration_safe_limit();
     1.8 +  HeapWord* concurrent_iteration_safe_limit() {
     1.9 +    assert(_concurrent_iteration_safe_limit <= top(),
    1.10 +           "_concurrent_iteration_safe_limit update missed");
    1.11 +    return _concurrent_iteration_safe_limit;
    1.12 +  }
    1.13    // changes the safe limit, all objects from bottom() to the new
    1.14    // limit should be properly initialized
    1.15 -  inline void set_concurrent_iteration_safe_limit(HeapWord* new_limit);
    1.16 +  void set_concurrent_iteration_safe_limit(HeapWord* new_limit) {
    1.17 +    assert(new_limit <= top(), "uninitialized objects in the safe range");
    1.18 +    _concurrent_iteration_safe_limit = new_limit;
    1.19 +  }
    1.20  
    1.21  #ifndef SERIALGC
    1.22    // In support of parallel oop_iterate.

     2.1 --- a/src/share/vm/memory/space.inline.hpp	Fri May 04 15:26:05 2012 -0700
     2.2 +++ b/src/share/vm/memory/space.inline.hpp	Thu May 10 11:27:10 2012 +0200
     2.3 @@ -67,17 +67,4 @@
     2.4    return _offsets.block_start(p);
     2.5  }
     2.6  
     2.7 -inline HeapWord* ContiguousSpace::concurrent_iteration_safe_limit()
     2.8 -{
     2.9 -  assert(_concurrent_iteration_safe_limit <= top(),
    2.10 -         "_concurrent_iteration_safe_limit update missed");
    2.11 -  return _concurrent_iteration_safe_limit;
    2.12 -}
    2.13 -
    2.14 -inline void ContiguousSpace::set_concurrent_iteration_safe_limit(HeapWord* new_limit)
    2.15 -{
    2.16 -  assert(new_limit <= top(), "uninitialized objects in the safe range");
    2.17 -  _concurrent_iteration_safe_limit = new_limit;
    2.18 -}
    2.19 -
    2.20  #endif // SHARE_VM_MEMORY_SPACE_INLINE_HPP