diff -r a34b3268a14f src/share/vm/gc/parallel/parMarkBitMap.cpp --- a/src/share/vm/gc/parallel/parMarkBitMap.cpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/gc/parallel/parMarkBitMap.cpp Thu Dec 24 23:13:36 2015 +0800 @@ -23,7 +23,7 @@ */ #include "precompiled.hpp" -#include "gc/parallel/parMarkBitMap.hpp" +#include "gc/parallel/parMarkBitMap.inline.hpp" #include "gc/parallel/psParallelCompact.hpp" #include "oops/oop.inline.hpp" #include "runtime/atomic.inline.hpp" @@ -96,7 +96,7 @@ return false; } -size_t ParMarkBitMap::live_words_in_range(HeapWord* beg_addr, oop end_obj) const +size_t ParMarkBitMap::live_words_in_range_helper(HeapWord* beg_addr, oop end_obj) const { assert(beg_addr <= (HeapWord*)end_obj, "bad range"); assert(is_marked(end_obj), "end_obj must be live"); @@ -117,6 +117,38 @@ return bits_to_words(live_bits); } +size_t ParMarkBitMap::live_words_in_range_use_cache(ParCompactionManager* cm, HeapWord* beg_addr, oop end_obj) const +{ + HeapWord* last_beg = cm->get_last_lwir_beg(); + oop last_obj = cm->get_last_lwir_obj(); + size_t last_ret = cm->get_last_lwir_ret(); + if (end_obj > last_obj) { + last_ret = last_ret + live_words_in_range_helper((HeapWord*)last_obj, end_obj); + last_obj = end_obj; + } else if (end_obj < last_obj) { + if (pointer_delta((HeapWord*)end_obj, (HeapWord*)beg_addr) > pointer_delta((HeapWord*)last_obj, (HeapWord*)end_obj)) { + last_ret = last_ret - live_words_in_range_helper((HeapWord*)end_obj, last_obj); + } else { + last_ret = live_words_in_range_helper(beg_addr, end_obj); + } + last_obj = end_obj; + } + + update_live_words_in_range_cache(cm, last_beg, last_obj, last_ret); + return last_ret; +} + +size_t ParMarkBitMap::live_words_in_range(ParCompactionManager* cm, HeapWord* beg_addr, oop end_obj) const +{ + //try reuse result in ParCompactionManager cache + if (is_live_words_in_range_in_cache(cm, beg_addr)) { + return live_words_in_range_use_cache(cm, beg_addr, end_obj); + } + size_t ret = live_words_in_range_helper(beg_addr, end_obj); + update_live_words_in_range_cache(cm, beg_addr, end_obj, ret); + return ret; +} + ParMarkBitMap::IterationStatus ParMarkBitMap::iterate(ParMarkBitMapClosure* live_closure, idx_t range_beg, idx_t range_end) const diff -r a34b3268a14f src/share/vm/gc/parallel/parMarkBitMap.hpp --- a/src/share/vm/gc/parallel/parMarkBitMap.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/gc/parallel/parMarkBitMap.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -31,6 +31,7 @@ class ParMarkBitMapClosure; class PSVirtualSpace; +class ParCompactionManager; class ParMarkBitMap: public CHeapObj { @@ -124,7 +125,13 @@ // the range are included in the result. The end of the range must be a live object, // which is the case when updating pointers. This allows a branch to be removed // from inside the loop. - size_t live_words_in_range(HeapWord* beg_addr, oop end_obj) const; + size_t live_words_in_range_helper(HeapWord* beg_addr, oop end_obj) const; + + bool is_live_words_in_range_in_cache(ParCompactionManager* cm, HeapWord* beg_addr) const; + size_t live_words_in_range_use_cache(ParCompactionManager* cm, HeapWord* beg_addr, oop end_obj) const; + void update_live_words_in_range_cache(ParCompactionManager* cm, HeapWord* beg_addr, oop end_obj, size_t result) const; + + size_t live_words_in_range(ParCompactionManager* cm, HeapWord* beg_addr, oop end_obj) const; inline HeapWord* region_start() const; inline HeapWord* region_end() const; diff -r a34b3268a14f src/share/vm/gc/parallel/parMarkBitMap.inline.hpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/vm/gc/parallel/parMarkBitMap.inline.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + + +#ifndef SHARE_VM_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP +#define SHARE_VM_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP + +#include "gc/parallel/parMarkBitMap.hpp" +#include "gc/parallel/psCompactionManager.hpp" + +inline bool ParMarkBitMap::is_live_words_in_range_in_cache(ParCompactionManager* cm, HeapWord* beg_addr) const { + return cm->get_last_lwir_beg() == beg_addr; +} + +inline void ParMarkBitMap::update_live_words_in_range_cache(ParCompactionManager* cm, HeapWord* beg_addr, oop end_obj, size_t result) const { + cm->set_last_lwir_beg(beg_addr); + cm->set_last_lwir_obj(end_obj); + cm->set_last_lwir_ret(result); +} + +#endif // SHARE_VM_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP diff -r a34b3268a14f src/share/vm/gc/parallel/psCompactionManager.cpp --- a/src/share/vm/gc/parallel/psCompactionManager.cpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/gc/parallel/psCompactionManager.cpp Thu Dec 24 23:13:36 2015 +0800 @@ -123,6 +123,13 @@ "Not initialized?"); } +void ParCompactionManager::reset_cache_for_bitmap() { + uint parallel_gc_threads = PSParallelCompact::gc_task_manager()->workers(); + for (uint i=0; i<=parallel_gc_threads; i++) { + _manager_array[i]->set_last_lwir_beg(NULL); + } +} + int ParCompactionManager::pop_recycled_stack_index() { assert(_recycled_bottom <= _recycled_top, "list is empty"); // Get the next available index diff -r a34b3268a14f src/share/vm/gc/parallel/psCompactionManager.hpp --- a/src/share/vm/gc/parallel/psCompactionManager.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/gc/parallel/psCompactionManager.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -109,6 +109,10 @@ Action _action; + HeapWord* _last_lwir_beg; + oop _last_lwir_obj; + size_t _last_lwir_ret; + static PSOldGen* old_gen() { return _old_gen; } static ObjectStartArray* start_array() { return _start_array; } static OopTaskQueueSet* stack_array() { return _stack_array; } @@ -130,6 +134,17 @@ Action action() { return _action; } void set_action(Action v) { _action = v; } + // Bitmap query support, cache last query and result + HeapWord* get_last_lwir_beg() { return _last_lwir_beg; } + oop get_last_lwir_obj() { return _last_lwir_obj; } + size_t get_last_lwir_ret() { return _last_lwir_ret; } + + void set_last_lwir_beg(HeapWord *new_beg) { _last_lwir_beg = new_beg; } + void set_last_lwir_obj(oop new_obj) { _last_lwir_obj = new_obj; } + void set_last_lwir_ret(size_t new_ret) { _last_lwir_ret = new_ret; } + + static void reset_cache_for_bitmap(); + RegionTaskQueue* region_stack() { return _region_stack; } void set_region_stack(RegionTaskQueue* v) { _region_stack = v; } diff -r a34b3268a14f src/share/vm/gc/parallel/psCompactionManager.inline.hpp --- a/src/share/vm/gc/parallel/psCompactionManager.inline.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/gc/parallel/psCompactionManager.inline.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -144,7 +144,7 @@ } inline void ParCompactionManager::update_contents(oop obj) { - obj->pc_update_contents(); + obj->pc_update_contents(this); } #endif // SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP diff -r a34b3268a14f src/share/vm/gc/parallel/psParallelCompact.cpp --- a/src/share/vm/gc/parallel/psParallelCompact.cpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/gc/parallel/psParallelCompact.cpp Thu Dec 24 23:13:36 2015 +0800 @@ -746,7 +746,7 @@ return true; } -HeapWord* ParallelCompactData::calc_new_pointer(HeapWord* addr) { +HeapWord* ParallelCompactData::calc_new_pointer(HeapWord* addr, ParCompactionManager* cm) { assert(addr != NULL, "Should detect NULL oop earlier"); assert(ParallelScavengeHeap::heap()->is_in(addr), "not in heap"); assert(PSParallelCompact::mark_bitmap()->is_marked(addr), "not marked"); @@ -783,7 +783,7 @@ const size_t block_offset = addr_to_block_ptr(addr)->offset(); const ParMarkBitMap* bitmap = PSParallelCompact::mark_bitmap(); - const size_t live = bitmap->live_words_in_range(search_start, oop(addr)); + const size_t live = bitmap->live_words_in_range(cm, search_start, oop(addr)); result += block_offset + live; DEBUG_ONLY(PSParallelCompact::check_new_location(addr, result)); return result; @@ -820,11 +820,9 @@ bool PSParallelCompact::IsAliveClosure::do_object_b(oop p) { return mark_bitmap()->is_marked(p); } -PSParallelCompact::AdjustPointerClosure PSParallelCompact::_adjust_pointer_closure; -PSParallelCompact::AdjustKlassClosure PSParallelCompact::_adjust_klass_closure; - void PSParallelCompact::AdjustKlassClosure::do_klass(Klass* klass) { - klass->oops_do(&PSParallelCompact::_adjust_pointer_closure); + PSParallelCompact::AdjustPointerClosure closure(_cm); + klass->oops_do(&closure); } void PSParallelCompact::post_initialize() { @@ -1000,6 +998,8 @@ // Have worker threads release resources the next time they run a task. gc_task_manager()->release_all_resources(); + + ParCompactionManager::reset_cache_for_bitmap(); } void PSParallelCompact::post_compact() @@ -1839,7 +1839,7 @@ // adjust_roots() updates Universe::_intArrayKlassObj which is // needed by the compaction for filling holes in the dense prefix. - adjust_roots(); + adjust_roots(vmthread_cm); compaction_start.update(); compact(); @@ -2199,39 +2199,42 @@ }; static PSAlwaysTrueClosure always_true; -void PSParallelCompact::adjust_roots() { +void PSParallelCompact::adjust_roots(ParCompactionManager* cm) { // Adjust the pointers to reflect the new locations GCTraceTime tm("adjust roots", print_phases(), true, &_gc_timer); // Need new claim bits when tracing through and adjusting pointers. ClassLoaderDataGraph::clear_claimed_marks(); + PSParallelCompact::AdjustPointerClosure closure(cm); + PSParallelCompact::AdjustKlassClosure kclosure(cm); + // General strong roots. - Universe::oops_do(adjust_pointer_closure()); - JNIHandles::oops_do(adjust_pointer_closure()); // Global (strong) JNI handles - CLDToOopClosure adjust_from_cld(adjust_pointer_closure()); - Threads::oops_do(adjust_pointer_closure(), &adjust_from_cld, NULL); - ObjectSynchronizer::oops_do(adjust_pointer_closure()); - FlatProfiler::oops_do(adjust_pointer_closure()); - Management::oops_do(adjust_pointer_closure()); - JvmtiExport::oops_do(adjust_pointer_closure()); - SystemDictionary::oops_do(adjust_pointer_closure()); - ClassLoaderDataGraph::oops_do(adjust_pointer_closure(), adjust_klass_closure(), true); + Universe::oops_do(&closure); + JNIHandles::oops_do(&closure); // Global (strong) JNI handles + CLDToOopClosure adjust_from_cld(&closure); + Threads::oops_do(&closure, &adjust_from_cld, NULL); + ObjectSynchronizer::oops_do(&closure); + FlatProfiler::oops_do(&closure); + Management::oops_do(&closure); + JvmtiExport::oops_do(&closure); + SystemDictionary::oops_do(&closure); + ClassLoaderDataGraph::oops_do(&closure, &kclosure, true); // Now adjust pointers in remaining weak roots. (All of which should // have been cleared if they pointed to non-surviving objects.) // Global (weak) JNI handles - JNIHandles::weak_oops_do(&always_true, adjust_pointer_closure()); - - CodeBlobToOopClosure adjust_from_blobs(adjust_pointer_closure(), CodeBlobToOopClosure::FixRelocations); + JNIHandles::weak_oops_do(&always_true, &closure); + + CodeBlobToOopClosure adjust_from_blobs(&closure, CodeBlobToOopClosure::FixRelocations); CodeCache::blobs_do(&adjust_from_blobs); - StringTable::oops_do(adjust_pointer_closure()); - ref_processor()->weak_oops_do(adjust_pointer_closure()); + StringTable::oops_do(&closure); + ref_processor()->weak_oops_do(&closure); // Roots were visited so references into the young gen in roots // may have been scanned. Process them also. // Should the reference processor have a span that excludes // young gen objects? - PSScavenge::reference_processor()->weak_oops_do(adjust_pointer_closure()); + PSScavenge::reference_processor()->weak_oops_do(&closure); } void PSParallelCompact::enqueue_region_draining_tasks(GCTaskQueue* q, @@ -3088,18 +3091,20 @@ update_state(words); } -void InstanceKlass::oop_pc_update_pointers(oop obj) { - oop_oop_iterate_oop_maps(obj, PSParallelCompact::adjust_pointer_closure()); +void InstanceKlass::oop_pc_update_pointers(oop obj, ParCompactionManager* cm) { + PSParallelCompact::AdjustPointerClosure closure(cm); + oop_oop_iterate_oop_maps(obj, &closure); } -void InstanceMirrorKlass::oop_pc_update_pointers(oop obj) { - InstanceKlass::oop_pc_update_pointers(obj); - - oop_oop_iterate_statics(obj, PSParallelCompact::adjust_pointer_closure()); +void InstanceMirrorKlass::oop_pc_update_pointers(oop obj, ParCompactionManager* cm) { + InstanceKlass::oop_pc_update_pointers(obj, cm); + + PSParallelCompact::AdjustPointerClosure closure(cm); + oop_oop_iterate_statics(obj, &closure); } -void InstanceClassLoaderKlass::oop_pc_update_pointers(oop obj) { - InstanceKlass::oop_pc_update_pointers(obj); +void InstanceClassLoaderKlass::oop_pc_update_pointers(oop obj, ParCompactionManager* cm) { + InstanceKlass::oop_pc_update_pointers(obj, cm); } #ifdef ASSERT @@ -3123,33 +3128,34 @@ #endif template -static void oop_pc_update_pointers_specialized(oop obj) { +static void oop_pc_update_pointers_specialized(oop obj, ParCompactionManager* cm) { T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj); - PSParallelCompact::adjust_pointer(referent_addr); + PSParallelCompact::adjust_pointer(referent_addr, cm); T* next_addr = (T*)java_lang_ref_Reference::next_addr(obj); - PSParallelCompact::adjust_pointer(next_addr); + PSParallelCompact::adjust_pointer(next_addr, cm); T* discovered_addr = (T*)java_lang_ref_Reference::discovered_addr(obj); - PSParallelCompact::adjust_pointer(discovered_addr); + PSParallelCompact::adjust_pointer(discovered_addr, cm); debug_only(trace_reference_gc("InstanceRefKlass::oop_update_ptrs", obj, referent_addr, next_addr, discovered_addr);) } -void InstanceRefKlass::oop_pc_update_pointers(oop obj) { - InstanceKlass::oop_pc_update_pointers(obj); +void InstanceRefKlass::oop_pc_update_pointers(oop obj, ParCompactionManager* cm) { + InstanceKlass::oop_pc_update_pointers(obj, cm); if (UseCompressedOops) { - oop_pc_update_pointers_specialized(obj); + oop_pc_update_pointers_specialized(obj, cm); } else { - oop_pc_update_pointers_specialized(obj); + oop_pc_update_pointers_specialized(obj, cm); } } -void ObjArrayKlass::oop_pc_update_pointers(oop obj) { +void ObjArrayKlass::oop_pc_update_pointers(oop obj, ParCompactionManager* cm) { assert(obj->is_objArray(), "obj must be obj array"); - oop_oop_iterate_elements(objArrayOop(obj), PSParallelCompact::adjust_pointer_closure()); + PSParallelCompact::AdjustPointerClosure closure(cm); + oop_oop_iterate_elements(objArrayOop(obj), &closure); } -void TypeArrayKlass::oop_pc_update_pointers(oop obj) { +void TypeArrayKlass::oop_pc_update_pointers(oop obj, ParCompactionManager* cm) { assert(obj->is_typeArray(),"must be a type array"); } diff -r a34b3268a14f src/share/vm/gc/parallel/psParallelCompact.hpp --- a/src/share/vm/gc/parallel/psParallelCompact.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/gc/parallel/psParallelCompact.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -451,10 +451,10 @@ HeapWord* partial_obj_end(size_t region_idx) const; // Return the location of the object after compaction. - HeapWord* calc_new_pointer(HeapWord* addr); + HeapWord* calc_new_pointer(HeapWord* addr, ParCompactionManager* cm); - HeapWord* calc_new_pointer(oop p) { - return calc_new_pointer((HeapWord*) p); + HeapWord* calc_new_pointer(oop p, ParCompactionManager* cm) { + return calc_new_pointer((HeapWord*) p, cm); } #ifdef ASSERT @@ -937,17 +937,29 @@ class AdjustPointerClosure: public ExtendedOopClosure { public: + AdjustPointerClosure(ParCompactionManager* cm) { + assert(cm != NULL, "associate ParCompactionManage should not be NULL"); + _cm = cm; + } template void do_oop_nv(T* p); virtual void do_oop(oop* p); virtual void do_oop(narrowOop* p); // This closure provides its own oop verification code. debug_only(virtual bool should_verify_oops() { return false; }) + private: + ParCompactionManager* _cm; }; class AdjustKlassClosure : public KlassClosure { public: + AdjustKlassClosure(ParCompactionManager* cm) { + assert(cm != NULL, "associate ParCompactionManage should not be NULL"); + _cm = cm; + } void do_klass(Klass* klass); + private: + ParCompactionManager* _cm; }; friend class AdjustPointerClosure; @@ -967,8 +979,6 @@ static IsAliveClosure _is_alive_closure; static SpaceInfo _space_info[last_space_id]; static bool _print_phases; - static AdjustPointerClosure _adjust_pointer_closure; - static AdjustKlassClosure _adjust_klass_closure; // Reference processing (used in ...follow_contents) static ReferenceProcessor* _ref_processor; @@ -1067,7 +1077,7 @@ static void summary_phase(ParCompactionManager* cm, bool maximum_compaction); // Adjust addresses in roots. Does not adjust addresses in heap. - static void adjust_roots(); + static void adjust_roots(ParCompactionManager* cm); DEBUG_ONLY(static void write_block_fill_histogram(outputStream* const out);) @@ -1113,10 +1123,6 @@ static bool initialize(); // Closure accessors - static PSParallelCompact::AdjustPointerClosure* adjust_pointer_closure() { - return &_adjust_pointer_closure; - } - static KlassClosure* adjust_klass_closure() { return (KlassClosure*)&_adjust_klass_closure; } static BoolObjectClosure* is_alive_closure() { return (BoolObjectClosure*)&_is_alive_closure; } // Public accessors @@ -1131,7 +1137,7 @@ static inline bool mark_obj(oop obj); static inline bool is_marked(oop obj); - template static inline void adjust_pointer(T* p); + template static inline void adjust_pointer(T* p, ParCompactionManager* cm); // Compaction support. // Return true if p is in the range [beg_addr, end_addr). diff -r a34b3268a14f src/share/vm/gc/parallel/psParallelCompact.inline.hpp --- a/src/share/vm/gc/parallel/psParallelCompact.inline.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/gc/parallel/psParallelCompact.inline.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -32,13 +32,13 @@ #include "oops/oop.inline.hpp" template -inline void PSParallelCompact::adjust_pointer(T* p) { +inline void PSParallelCompact::adjust_pointer(T* p, ParCompactionManager* cm) { T heap_oop = oopDesc::load_heap_oop(p); if (!oopDesc::is_null(heap_oop)) { oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); assert(ParallelScavengeHeap::heap()->is_in(obj), "should be in heap"); - oop new_obj = (oop)summary_data().calc_new_pointer(obj); + oop new_obj = (oop)summary_data().calc_new_pointer(obj, cm); assert(new_obj != NULL, // is forwarding ptr? "should be forwarded"); // Just always do the update unconditionally? @@ -52,7 +52,7 @@ template void PSParallelCompact::AdjustPointerClosure::do_oop_nv(T* p) { - adjust_pointer(p); + adjust_pointer(p, _cm); } inline void PSParallelCompact::AdjustPointerClosure::do_oop(oop* p) { do_oop_nv(p); } diff -r a34b3268a14f src/share/vm/oops/instanceClassLoaderKlass.hpp --- a/src/share/vm/oops/instanceClassLoaderKlass.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/oops/instanceClassLoaderKlass.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -56,7 +56,7 @@ void oop_ps_push_contents( oop obj, PSPromotionManager* pm); // Parallel Compact void oop_pc_follow_contents(oop obj, ParCompactionManager* cm); - void oop_pc_update_pointers(oop obj); + void oop_pc_update_pointers(oop obj, ParCompactionManager* cm); #endif // Oop fields (and metadata) iterators diff -r a34b3268a14f src/share/vm/oops/instanceKlass.hpp --- a/src/share/vm/oops/instanceKlass.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/oops/instanceKlass.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -1060,7 +1060,7 @@ void oop_ps_push_contents( oop obj, PSPromotionManager* pm); // Parallel Compact void oop_pc_follow_contents(oop obj, ParCompactionManager* cm); - void oop_pc_update_pointers(oop obj); + void oop_pc_update_pointers(oop obj, ParCompactionManager* cm); #endif // Oop fields (and metadata) iterators diff -r a34b3268a14f src/share/vm/oops/instanceMirrorKlass.hpp --- a/src/share/vm/oops/instanceMirrorKlass.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/oops/instanceMirrorKlass.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -97,7 +97,7 @@ void oop_ps_push_contents( oop obj, PSPromotionManager* pm); // Parallel Compact void oop_pc_follow_contents(oop obj, ParCompactionManager* cm); - void oop_pc_update_pointers(oop obj); + void oop_pc_update_pointers(oop obj, ParCompactionManager* cm); #endif // Oop fields (and metadata) iterators diff -r a34b3268a14f src/share/vm/oops/instanceRefKlass.hpp --- a/src/share/vm/oops/instanceRefKlass.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/oops/instanceRefKlass.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -66,7 +66,7 @@ void oop_ps_push_contents( oop obj, PSPromotionManager* pm); // Parallel Compact void oop_pc_follow_contents(oop obj, ParCompactionManager* cm); - void oop_pc_update_pointers(oop obj); + void oop_pc_update_pointers(oop obj, ParCompactionManager* cm); #endif // Oop fields (and metadata) iterators diff -r a34b3268a14f src/share/vm/oops/klass.hpp --- a/src/share/vm/oops/klass.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/oops/klass.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -577,7 +577,7 @@ virtual void oop_ps_push_contents( oop obj, PSPromotionManager* pm) = 0; // Parallel Compact virtual void oop_pc_follow_contents(oop obj, ParCompactionManager* cm) = 0; - virtual void oop_pc_update_pointers(oop obj) = 0; + virtual void oop_pc_update_pointers(oop obj, ParCompactionManager* cm) = 0; #endif // Iterators specialized to particular subtypes diff -r a34b3268a14f src/share/vm/oops/objArrayKlass.hpp --- a/src/share/vm/oops/objArrayKlass.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/oops/objArrayKlass.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -111,7 +111,7 @@ void oop_ps_push_contents( oop obj, PSPromotionManager* pm); // Parallel Compact void oop_pc_follow_contents(oop obj, ParCompactionManager* cm); - void oop_pc_update_pointers(oop obj); + void oop_pc_update_pointers(oop obj, ParCompactionManager* cm); #endif // Oop fields (and metadata) iterators diff -r a34b3268a14f src/share/vm/oops/oop.hpp --- a/src/share/vm/oops/oop.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/oops/oop.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -330,7 +330,7 @@ #if INCLUDE_ALL_GCS // Parallel Compact void pc_follow_contents(ParCompactionManager* pc); - void pc_update_contents(); + void pc_update_contents(ParCompactionManager* pc); // Parallel Scavenge void ps_push_contents(PSPromotionManager* pm); #endif diff -r a34b3268a14f src/share/vm/oops/oop.inline.hpp --- a/src/share/vm/oops/oop.inline.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/oops/oop.inline.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -707,11 +707,11 @@ klass()->oop_pc_follow_contents(this, cm); } -inline void oopDesc::pc_update_contents() { +inline void oopDesc::pc_update_contents(ParCompactionManager* cm) { Klass* k = klass(); if (!k->is_typeArray_klass()) { // It might contain oops beyond the header, so take the virtual call. - k->oop_pc_update_pointers(this); + k->oop_pc_update_pointers(this, cm); } // Else skip it. The TypeArrayKlass in the header never needs scavenging. } diff -r a34b3268a14f src/share/vm/oops/typeArrayKlass.hpp --- a/src/share/vm/oops/typeArrayKlass.hpp Wed Dec 02 15:55:39 2015 -0800 +++ b/src/share/vm/oops/typeArrayKlass.hpp Thu Dec 24 23:13:36 2015 +0800 @@ -81,7 +81,7 @@ void oop_ps_push_contents( oop obj, PSPromotionManager* pm); // Parallel Compact void oop_pc_follow_contents(oop obj, ParCompactionManager* cm); - void oop_pc_update_pointers(oop obj); + void oop_pc_update_pointers(oop obj, ParCompactionManager* cm); #endif // Oop iterators. Since there are no oops in TypeArrayKlasses,