infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-21 07:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

8358580: Rethink how classes are kept alive in training data

Browse Source 
Reviewed-by: coleenp, shade
This commit is contained in:
Igor Veresov 2025-07-11 18:07:13 +00:00
parent a86dd56de3
commit 59bec29c35
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hotspot/share/oops/trainingData.cpp
View File

@ -35,6 +35,7 @@
#include "memory/metadataFactory.hpp"
#include "memory/metaspaceClosure.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
#include "oops/method.hpp"
#include "oops/methodCounters.hpp"
#include "oops/trainingData.hpp"
@ -433,9 +434,9 @@ void KlassTrainingData::print_on(outputStream* st, bool name_only) const {
KlassTrainingData::KlassTrainingData(InstanceKlass* klass) : TrainingData(klass) {
assert(klass != nullptr, "");
Handle hm(JavaThread::current(), klass->java_mirror());
jobject hmj = JNIHandles::make_global(hm);
_holder_mirror = hmj;
// The OopHandle constructor will allocate a handle. We don't need to ever release it so we don't preserve
// the handle object.
OopHandle handle(Universe::vm_global(), klass->java_mirror());
_holder = klass;
assert(holder() == klass, "");
}
@ -759,7 +760,6 @@ void TrainingData::DepList<T>::prepare(ClassLoaderData* loader_data) {
void KlassTrainingData::remove_unshareable_info() {
TrainingData::remove_unshareable_info();
_holder_mirror = nullptr;
_comp_deps.remove_unshareable_info();
}

2
src/hotspot/share/oops/trainingData.hpp
View File

@ -431,7 +431,6 @@ class KlassTrainingData : public TrainingData {
// cross-link to live klass, or null if not loaded or encountered yet
InstanceKlass* _holder;
jobject _holder_mirror; // extra link to prevent unloading by GC
DepList<CompileTrainingData*> _comp_deps; // compiles that depend on me
@ -454,7 +453,6 @@ class KlassTrainingData : public TrainingData {
TrainingDataLocker::assert_locked();
_comp_deps.remove_if_existing(ctd);
}
public:
Symbol* name() const {
precond(has_holder());