OpenJDK / jdk / jdk
changeset 12597:904566185bdf
7167437: Can't build on linux without precompiled headers
Reviewed-by: brutisso, mgerdin
| author | stefank |
|---|---|
| date | Thu, 10 May 2012 11:27:10 +0200 |
| parents | 1f7495e12630 |
| children | 1256ef9b648a |
| files | hotspot/src/share/vm/memory/space.hpp hotspot/src/share/vm/memory/space.inline.hpp |
| diffstat | 2 files changed, 9 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/memory/space.hpp Fri May 04 15:26:05 2012 -0700 +++ b/hotspot/src/share/vm/memory/space.hpp Thu May 10 11:27:10 2012 +0200 @@ -880,10 +880,17 @@ void object_iterate_mem(MemRegion mr, UpwardsObjectClosure* cl); // iterates on objects up to the safe limit HeapWord* object_iterate_careful(ObjectClosureCareful* cl); - inline HeapWord* concurrent_iteration_safe_limit(); + HeapWord* concurrent_iteration_safe_limit() { + assert(_concurrent_iteration_safe_limit <= top(), + "_concurrent_iteration_safe_limit update missed"); + return _concurrent_iteration_safe_limit; + } // changes the safe limit, all objects from bottom() to the new // limit should be properly initialized - inline void set_concurrent_iteration_safe_limit(HeapWord* new_limit); + void set_concurrent_iteration_safe_limit(HeapWord* new_limit) { + assert(new_limit <= top(), "uninitialized objects in the safe range"); + _concurrent_iteration_safe_limit = new_limit; + } #ifndef SERIALGC // In support of parallel oop_iterate.
--- a/hotspot/src/share/vm/memory/space.inline.hpp Fri May 04 15:26:05 2012 -0700 +++ b/hotspot/src/share/vm/memory/space.inline.hpp Thu May 10 11:27:10 2012 +0200 @@ -67,17 +67,4 @@ return _offsets.block_start(p); } -inline HeapWord* ContiguousSpace::concurrent_iteration_safe_limit() -{ - assert(_concurrent_iteration_safe_limit <= top(), - "_concurrent_iteration_safe_limit update missed"); - return _concurrent_iteration_safe_limit; -} - -inline void ContiguousSpace::set_concurrent_iteration_safe_limit(HeapWord* new_limit) -{ - assert(new_limit <= top(), "uninitialized objects in the safe range"); - _concurrent_iteration_safe_limit = new_limit; -} - #endif // SHARE_VM_MEMORY_SPACE_INLINE_HPP