infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-14 17:08:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "8369021: A crash in ConstantPool::klass_at_impl"

Browse Source 
This reverts commit 026fcb1b21729e41524169c7f78855e8794ddae2.
This commit is contained in:
Jan Kratochvil 2025-10-09 20:58:35 +08:00
parent 026fcb1b21
commit 3360ce37c6
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hotspot/share/prims/jvm.cpp
View File

@ -1326,13 +1326,10 @@ JVM_ENTRY(jclass, JVM_GetDeclaringClass(JNIEnv *env, jclass ofClass))
if (!klass->is_instance_klass()) {
return nullptr;
}
InstanceKlass* k = InstanceKlass::cast(klass);
// Ensure class is linked
k->link_class(CHECK_NULL);
bool inner_is_member = false;
Klass* outer_klass = k->compute_enclosing_class(&inner_is_member, CHECK_NULL);
Klass* outer_klass
= InstanceKlass::cast(klass)->compute_enclosing_class(&inner_is_member, CHECK_NULL);
if (outer_klass == nullptr) return nullptr; // already a top-level class
if (!inner_is_member) return nullptr; // a hidden class (inside a method)
return (jclass) JNIHandles::make_local(THREAD, outer_klass->java_mirror());
@ -1350,10 +1347,6 @@ JVM_ENTRY(jstring, JVM_GetSimpleBinaryName(JNIEnv *env, jclass cls))
return nullptr;
}
InstanceKlass* k = InstanceKlass::cast(klass);
// Ensure class is linked
k->link_class(CHECK_NULL);
int ooff = 0, noff = 0;
if (k->find_inner_classes_attr(&ooff, &noff, THREAD)) {
if (noff != 0) {