diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.cpp b/src/hotspot/share/gc/g1/g1BarrierSet.cpp index 448f2f5fccf..8b87fc3d78a 100644 --- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp +++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp @@ -102,7 +102,7 @@ void G1BarrierSet::write_ref_field_post_slow(volatile CardValue* byte) { } } -void G1BarrierSet::invalidate(JavaThread* thread, MemRegion mr) { +void G1BarrierSet::write_region(JavaThread* thread, MemRegion mr) { if (mr.is_empty()) { return; } diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp index f641fabf7c3..c2f5b9dc068 100644 --- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp +++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp @@ -48,8 +48,6 @@ class G1BarrierSet: public CardTableBarrierSet { return barrier_set_cast(BarrierSet::barrier_set()); } - void invalidate(JavaThread* thread, MemRegion mr); - public: G1BarrierSet(G1CardTable* table); ~G1BarrierSet() { } @@ -73,8 +71,8 @@ class G1BarrierSet: public CardTableBarrierSet { template void write_ref_field_pre(T* field); - inline void invalidate(MemRegion mr); - inline void write_region(JavaThread* thread, MemRegion mr); + inline void write_region(MemRegion mr); + void write_region(JavaThread* thread, MemRegion mr); inline void write_ref_array_work(MemRegion mr); diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp index e5b477ad156..19901a76ae8 100644 --- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp +++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp @@ -68,16 +68,12 @@ inline void G1BarrierSet::write_ref_field_pre(T* field) { enqueue(field); } -inline void G1BarrierSet::invalidate(MemRegion mr) { - invalidate(JavaThread::current(), mr); -} - -inline void G1BarrierSet::write_region(JavaThread* thread, MemRegion mr) { - invalidate(thread, mr); +inline void G1BarrierSet::write_region(MemRegion mr) { + write_region(JavaThread::current(), mr); } inline void G1BarrierSet::write_ref_array_work(MemRegion mr) { - invalidate(mr); + write_region(mr); } template diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp index 1aab76d5ab5..d7a84b1ca56 100644 --- a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp +++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp @@ -84,7 +84,7 @@ void CardTableBarrierSet::write_ref_array_work(MemRegion mr) { _card_table->dirty_MemRegion(mr); } -void CardTableBarrierSet::invalidate(MemRegion mr) { +void CardTableBarrierSet::write_region(MemRegion mr) { _card_table->dirty_MemRegion(mr); } @@ -141,7 +141,7 @@ void CardTableBarrierSet::on_slowpath_allocation_exit(JavaThread* thread, oop ne thread->set_deferred_card_mark(mr); } else { // Do the card mark - invalidate(mr); + write_region(mr); } } #endif // COMPILER2_OR_JVMCI diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp index c650e2a1fd9..b52cfef9a59 100644 --- a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp +++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp @@ -67,7 +67,7 @@ public: void initialize(); void write_region(JavaThread* thread, MemRegion mr) { - invalidate(mr); + write_region(mr); } void write_ref_array_work(MemRegion mr); @@ -80,7 +80,7 @@ public: template void write_ref_field_post(T* field); - virtual void invalidate(MemRegion mr); + virtual void write_region(MemRegion mr); // ReduceInitialCardMarks void initialize_deferred_card_mark_barriers(); diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp index b490524feed..8355e8fc50f 100644 --- a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp +++ b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp @@ -52,7 +52,7 @@ public: inline void write_ref_field_post(T *addr) {} // Causes all refs in "mr" to be assumed to be modified (by this JavaThread). - virtual void invalidate(MemRegion mr) = 0; + virtual void write_region(MemRegion mr) = 0; // Causes all refs in "mr" to be assumed to be modified by the given JavaThread. virtual void write_region(JavaThread* thread, MemRegion mr) = 0; diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp index e17ed4f6bdb..45422167ead 100644 --- a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp @@ -138,7 +138,7 @@ inline void ModRefBarrierSet::AccessBarrier:: clone_in_heap(oop src, oop dst, size_t size) { Raw::clone(src, dst, size); BarrierSetT *bs = barrier_set_cast(barrier_set()); - bs->invalidate(MemRegion((HeapWord*)(void*)dst, size)); + bs->write_region(MemRegion((HeapWord*)(void*)dst, size)); } #endif // SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP