Skip to content

8358254: [AOT] runtime/cds/appcds/applications/JavacBench.java#aot crashes with SEGV in ClassLoaderData::holder #25592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

8358254: [AOT] runtime/cds/appcds/applications/JavacBench.java#aot crashes with SEGV in ClassLoaderData::holder #25592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9934fbd
convert RawItemProfile to a record
dougxc Jun 2, 2025
5f69e8d
support unloaded classes in type profiles in AOT mode
dougxc Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/hotspot/share/ci/ciMethodData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,7 @@ ciMethodData::ciMethodData(MethodData* md)


static bool is_klass_loaded(Klass* k) {
if (TrainingData::have_data()) {
// If we're running in AOT mode some classes may not be loaded yet
return !k->is_instance_klass() || InstanceKlass::cast(k)->is_loaded();
}
return true;
return TrainingData::is_klass_loaded(k);
}

// Check for entries that reference an unloaded method
Expand Down
9 changes: 7 additions & 2 deletions src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
#include "oops/instanceMirrorKlass.hpp"
#include "oops/method.inline.hpp"
#include "oops/objArrayKlass.inline.hpp"
#include "oops/trainingData.hpp"
#include "oops/typeArrayOop.inline.hpp"
#include "prims/jvmtiExport.hpp"
#include "prims/methodHandles.hpp"
Expand Down Expand Up @@ -505,11 +506,15 @@ C2V_VMENTRY_NULL(jobject, getResolvedJavaType0, (JNIEnv* env, jobject, jobject b
}
} else if (JVMCIENV->isa_HotSpotMethodData(base_object)) {
jlong base_address = (intptr_t) JVMCIENV->asMethodData(base_object);
klass = *((Klass**) (intptr_t) (base_address + offset));
if (klass == nullptr || !klass->is_loader_alive()) {
Klass* k = *((Klass**) (intptr_t) (base_address + offset));
if (k == nullptr || k->class_loader_data() == nullptr || !TrainingData::is_klass_loaded(k)) {
return nullptr;
}
if (!k->is_loader_alive()) {
// Klasses in methodData might be concurrently unloading so return null in that case.
return nullptr;
}
klass = k;
} else {
goto unexpected;
}
Expand Down
8 changes: 8 additions & 0 deletions src/hotspot/share/oops/trainingData.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,14 @@ class TrainingData : public Metadata {
static bool need_data() { return AOTRecordTraining; } // Going to write
static bool assembling_data() { return have_data() && CDSConfig::is_dumping_final_static_archive() && CDSConfig::is_dumping_aot_linked_classes(); }

static bool is_klass_loaded(Klass* k) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code was moved unmodified from ciMethodData.cpp.

if (have_data()) {
// If we're running in AOT mode some classes may not be loaded yet
return !k->is_instance_klass() || InstanceKlass::cast(k)->is_loaded();
}
return true;
}

template<typename Function>
static void iterate(const Function& fn) { iterate(const_cast<Function&>(fn)); }

Expand Down
14 changes: 1 addition & 13 deletions src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,19 +443,7 @@ public StringBuilder appendTo(StringBuilder sb, HotSpotMethodData data, int pos)
}
}

static class RawItemProfile<T> {
final int entries;
final T[] items;
final long[] counts;
final long totalCount;

RawItemProfile(int entries, T[] items, long[] counts, long totalCount) {
this.entries = entries;
this.items = items;
this.counts = counts;
this.totalCount = totalCount;
}
}
record RawItemProfile<T>(int entries, T[] items, long[] counts, long totalCount) {}

abstract static class AbstractTypeData extends CounterData {

Expand Down