From 25180e7169608d2470a50dd418c1a224c472f734 Mon Sep 17 00:00:00 2001 From: Francesco Andreuzzi Date: Sun, 7 Dec 2025 00:43:00 +0000 Subject: [PATCH] make non static --- src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp | 2 -- src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp | 8 ++++---- src/hotspot/share/gc/parallel/psScavenge.hpp | 2 +- src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp index 9df3deedf8953..b85b16f58b5ae 100644 --- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp +++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp @@ -58,8 +58,6 @@ #include "utilities/macros.hpp" #include "utilities/vmError.hpp" -PSYoungGen* ParallelScavengeHeap::_young_gen = nullptr; -PSOldGen* ParallelScavengeHeap::_old_gen = nullptr; PSAdaptiveSizePolicy* ParallelScavengeHeap::_size_policy = nullptr; GCPolicyCounters* ParallelScavengeHeap::_gc_policy_counters = nullptr; size_t ParallelScavengeHeap::_desired_page_size = 0; diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp index 5d8ddbcaaed1b..588ddfa3f0c54 100644 --- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp +++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp @@ -69,8 +69,8 @@ class ReservedSpace; class ParallelScavengeHeap : public CollectedHeap { friend class VMStructs; private: - static PSYoungGen* _young_gen; - static PSOldGen* _old_gen; + PSYoungGen* _young_gen; + PSOldGen* _old_gen; // Sizing policy for entire heap static PSAdaptiveSizePolicy* _size_policy; @@ -160,8 +160,8 @@ class ParallelScavengeHeap : public CollectedHeap { GrowableArray memory_managers() override; GrowableArray memory_pools() override; - static PSYoungGen* young_gen() { return _young_gen; } - static PSOldGen* old_gen() { return _old_gen; } + PSYoungGen* young_gen() const { return _young_gen; } + PSOldGen* old_gen() const { return _old_gen; } PSAdaptiveSizePolicy* size_policy() { return _size_policy; } diff --git a/src/hotspot/share/gc/parallel/psScavenge.hpp b/src/hotspot/share/gc/parallel/psScavenge.hpp index af9b91f74bcf1..df97a1c1eded4 100644 --- a/src/hotspot/share/gc/parallel/psScavenge.hpp +++ b/src/hotspot/share/gc/parallel/psScavenge.hpp @@ -115,7 +115,7 @@ class PSScavenge: AllStatic { } static bool is_obj_in_to_space(oop o) { - return ParallelScavengeHeap::young_gen()->to_space()->contains(o); + return ParallelScavengeHeap::heap()->young_gen()->to_space()->contains(o); } }; diff --git a/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp b/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp index f5e7375fca1dd..e45bd45400c22 100644 --- a/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp +++ b/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp @@ -64,8 +64,8 @@ nonstatic_field(PSOldGen, _max_gen_size, const size_t) \ \ \ - static_field(ParallelScavengeHeap, _young_gen, PSYoungGen*) \ - static_field(ParallelScavengeHeap, _old_gen, PSOldGen*) \ + nonstatic_field(ParallelScavengeHeap, _young_gen, PSYoungGen*) \ + nonstatic_field(ParallelScavengeHeap, _old_gen, PSOldGen*) \ \ #define VM_TYPES_PARALLELGC(declare_type, \