make 'assert_used_and_recalculate_used_equal' into a member function

LizBing · Dec 23, 2023 · 8133b55 · 8133b55
1 parent 75f3010
commit 8133b55
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -761,7 +761,7 @@ void G1CollectedHeap::prepare_heap_for_full_collection() {
 }
 
 void G1CollectedHeap::verify_before_full_collection() {
- assert_used_and_recalculate_used_equal(this);
+ assert_used_and_recalculate_used_equal();
  if (!VerifyBeforeGC) {
  return;
  }
@@ -2845,7 +2845,7 @@ void G1CollectedHeap::rebuild_region_sets(bool free_list_only) {
  if (!free_list_only) {
  set_used(cl.total_used());
  }
- assert_used_and_recalculate_used_equal(this);
+ assert_used_and_recalculate_used_equal();
 }
 
 // Methods for the mutator alloc region

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -315,7 +315,7 @@ class G1CollectedHeap : public CollectedHeap {
  inline static void assert_heap_not_locked() NOT_DEBUG_RETURN;
  inline static void assert_heap_not_locked_and_not_at_safepoint() NOT_DEBUG_RETURN;
  inline static void assert_at_safepoint_on_vm_thread() NOT_DEBUG_RETURN;
- inline static void assert_used_and_recalculate_used_equal(G1CollectedHeap* g1h) NOT_DEBUG_RETURN;
+ inline void assert_used_and_recalculate_used_equal() const NOT_DEBUG_RETURN;
 
 private:
  // The young region list.

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
@@ -361,9 +361,9 @@ inline void G1CollectedHeap::assert_at_safepoint_on_vm_thread() {
 }
 
 inline void G1CollectedHeap::
-assert_used_and_recalculate_used_equal(G1CollectedHeap* g1h) {
- size_t cur_used_bytes = g1h->used();
- size_t recal_used_bytes = g1h->recalculate_used();
+assert_used_and_recalculate_used_equal() const {
+ size_t cur_used_bytes = used();
+ size_t recal_used_bytes = recalculate_used();
  assert(cur_used_bytes == recal_used_bytes, "Used(" SIZE_FORMAT ") is not"
  " same as recalculated used(" SIZE_FORMAT ").",
  cur_used_bytes, recal_used_bytes);

diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -682,7 +682,7 @@ void G1Policy::record_young_collection_start() {
  assert(max_survivor_regions() + _g1h->num_used_regions() <= _g1h->max_regions(),
  "Maximum survivor regions %u plus used regions %u exceeds max regions %u",
  max_survivor_regions(), _g1h->num_used_regions(), _g1h->max_regions());
- G1CollectedHeap::assert_used_and_recalculate_used_equal(_g1h);
+ G1CollectedHeap::heap()->assert_used_and_recalculate_used_equal();
 
  phase_times()->record_cur_collection_start_sec(now.seconds());
 

diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -1012,7 +1012,7 @@ void G1YoungCollector::post_evacuate_collection_set(G1EvacInfo* evacuation_info,
 
  _evac_failure_regions.post_collection();
 
- G1CollectedHeap::assert_used_and_recalculate_used_equal(_g1h);
+ G1CollectedHeap::heap()->assert_used_and_recalculate_used_equal();
 
  _g1h->rebuild_free_region_list();