infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-20 04:43:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

8361706: Parallel weak klass link cleaning does not clean out previous klasses

Browse Source 
Reviewed-by: eosterlund, coleenp
This commit is contained in:
Thomas Schatzl 2025-07-14 09:39:06 +00:00
parent 272e66d017
commit 99c299f098
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/gc/shared/parallelCleaning.cpp
View File

@ -128,6 +128,6 @@ void KlassCleaningTask::work() {
// All workers will help cleaning the classes,
InstanceKlass* klass;
while ((klass = claim_next_klass()) != nullptr) {
clean_klass(klass);
Klass::clean_weak_instanceklass_links(klass);
}
}

4
src/hotspot/share/gc/shared/parallelCleaning.hpp
View File

@ -66,10 +66,6 @@ private:
public:
void clean_klass(InstanceKlass* ik) {
ik->clean_weak_instanceklass_links();
}
void work();
};

17
src/hotspot/share/oops/klass.cpp
View File

@ -749,17 +749,20 @@ void Klass::clean_weak_klass_links(bool unloading_occurred, bool clean_alive_kla
// Clean the implementors list and method data.
if (clean_alive_klasses && current->is_instance_klass()) {
InstanceKlass* ik = InstanceKlass::cast(current);
ik->clean_weak_instanceklass_links();
// JVMTI RedefineClasses creates previous versions that are not in
// the class hierarchy, so process them here.
while ((ik = ik->previous_versions()) != nullptr) {
ik->clean_weak_instanceklass_links();
}
clean_weak_instanceklass_links(ik);
}
}
}
void Klass::clean_weak_instanceklass_links(InstanceKlass* ik) {
ik->clean_weak_instanceklass_links();
// JVMTI RedefineClasses creates previous versions that are not in
// the class hierarchy, so process them here.
while ((ik = ik->previous_versions()) != nullptr) {
ik->clean_weak_instanceklass_links();
}
}
void Klass::metaspace_pointers_do(MetaspaceClosure* it) {
if (log_is_enabled(Trace, aot)) {
ResourceMark rm;

3
src/hotspot/share/oops/klass.hpp
View File

@ -734,7 +734,10 @@ public:
void clean_subklass();
// Clean out unnecessary weak klass links from the whole klass hierarchy.
static void clean_weak_klass_links(bool unloading_occurred, bool clean_alive_klasses = true);
// Clean out unnecessary weak klass links from the given InstanceKlass.
static void clean_weak_instanceklass_links(InstanceKlass* ik);
// Return self, except for abstract classes with exactly 1
// implementor. Then return the 1 concrete implementation.