diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp index d90d83298c9..7652bf8c7af 100644 --- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp +++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp @@ -78,7 +78,7 @@ class G1BarrierSet: public CardTableBarrierSet { void write_ref_array_work(MemRegion mr) { invalidate(mr); } template - void write_ref_field_post(T* field, oop new_val); + void write_ref_field_post(T* field); void write_ref_field_post_slow(volatile CardValue* byte); virtual void on_thread_create(Thread* thread); diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp index f7a6fd3ee5a..32d239ef695 100644 --- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp +++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp @@ -68,7 +68,7 @@ inline void G1BarrierSet::write_ref_field_pre(T* field) { } template -inline void G1BarrierSet::write_ref_field_post(T* field, oop new_val) { +inline void G1BarrierSet::write_ref_field_post(T* field) { volatile CardValue* byte = _card_table->byte_for(field); if (*byte != G1CardTable::g1_young_card_val()) { // Take a slow path for cards in old diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp index 43a70d82d42..feff87688fa 100644 --- a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp +++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp @@ -80,7 +80,7 @@ protected: // either precise or imprecise. We make non-virtual inline variants of // these functions here for performance. template - void write_ref_field_post(T* field, oop newVal); + void write_ref_field_post(T* field); virtual void invalidate(MemRegion mr); diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp index aa12f97452b..dd0690d44fb 100644 --- a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp @@ -31,7 +31,7 @@ #include "runtime/atomic.hpp" template -inline void CardTableBarrierSet::write_ref_field_post(T* field, oop newVal) { +inline void CardTableBarrierSet::write_ref_field_post(T* field) { volatile CardValue* byte = _card_table->byte_for(field); *byte = CardTable::dirty_card_val(); } diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp index 3013a51eb96..4eca9154660 100644 --- a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp +++ b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp @@ -49,7 +49,7 @@ public: inline void write_ref_field_pre(T* addr) {} template - inline void write_ref_field_post(T *addr, oop new_value) {} + inline void write_ref_field_post(T *addr) {} // Causes all refs in "mr" to be assumed to be modified. virtual void invalidate(MemRegion mr) = 0; diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp index 2f2231283dd..8034d3bda9f 100644 --- a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp @@ -63,7 +63,7 @@ oop_store_in_heap(T* addr, oop value) { BarrierSetT *bs = barrier_set_cast(barrier_set()); bs->template write_ref_field_pre(addr); Raw::oop_store(addr, value); - bs->template write_ref_field_post(addr, value); + bs->template write_ref_field_post(addr); } template @@ -74,7 +74,7 @@ oop_atomic_cmpxchg_in_heap(T* addr, oop compare_value, oop new_value) { bs->template write_ref_field_pre(addr); oop result = Raw::oop_atomic_cmpxchg(addr, compare_value, new_value); if (result == compare_value) { - bs->template write_ref_field_post(addr, new_value); + bs->template write_ref_field_post(addr); } return result; } @@ -86,7 +86,7 @@ oop_atomic_xchg_in_heap(T* addr, oop new_value) { BarrierSetT *bs = barrier_set_cast(barrier_set()); bs->template write_ref_field_pre(addr); oop result = Raw::oop_atomic_xchg(addr, new_value); - bs->template write_ref_field_post(addr, new_value); + bs->template write_ref_field_post(addr); return result; }