stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8257700: Add logging for sealed classes in JVM_GetPermittedSubclasses

Browse Source 
Reviewed-by: lfoltan, coleenp, dholmes
This commit is contained in:
Harold Seigel 2020-12-16 19:20:54 +00:00
parent c4632647ae
commit 330ce86123
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1851,7 +1851,6 @@ JVM_ENTRY(jobjectArray, JVM_GetClassDeclaredFields(JNIEnv *env, jclass ofClass,
} }
JVM_END JVM_END
// A class is a record if and only if it is final and a direct subclass of // A class is a record if and only if it is final and a direct subclass of
// java.lang.Record and has a Record attribute; otherwise, it is not a record. // java.lang.Record and has a Record attribute; otherwise, it is not a record.
JVM_ENTRY(jboolean, JVM_IsRecord(JNIEnv *env, jclass cls)) JVM_ENTRY(jboolean, JVM_IsRecord(JNIEnv *env, jclass cls))
@ -2127,10 +2126,16 @@ JVM_ENTRY(jobjectArray, JVM_GetPermittedSubclasses(JNIEnv* env, jclass current))
Klass* c = java_lang_Class::as_Klass(mirror); Klass* c = java_lang_Class::as_Klass(mirror);
assert(c->is_instance_klass(), "must be"); assert(c->is_instance_klass(), "must be");
InstanceKlass* ik = InstanceKlass::cast(c); InstanceKlass* ik = InstanceKlass::cast(c);
ResourceMark rm(THREAD);
log_trace(class, sealed)("Calling GetPermittedSubclasses for %s type %s",
ik->is_sealed() ? "sealed" : "non-sealed", ik->external_name());
if (ik->is_sealed()) { if (ik->is_sealed()) {
JvmtiVMObjectAllocEventCollector oam; JvmtiVMObjectAllocEventCollector oam;
Array<u2>* subclasses = ik->permitted_subclasses(); Array<u2>* subclasses = ik->permitted_subclasses();
int length = subclasses->length(); int length = subclasses->length();
log_trace(class, sealed)(" - sealed class has %d permitted subclasses", length);
objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(), objArrayOop r = oopFactory::new_objArray(SystemDictionary::Class_klass(),
length, CHECK_NULL); length, CHECK_NULL);
objArrayHandle result(THREAD, r); objArrayHandle result(THREAD, r);
@ -2142,14 +2147,24 @@ JVM_ENTRY(jobjectArray, JVM_GetPermittedSubclasses(JNIEnv* env, jclass current))
if (PENDING_EXCEPTION->is_a(SystemDictionary::VirtualMachineError_klass())) { if (PENDING_EXCEPTION->is_a(SystemDictionary::VirtualMachineError_klass())) {
return NULL; // propagate VMEs return NULL; // propagate VMEs
} }
if (log_is_enabled(Trace, class, sealed)) {
stringStream ss;
char* permitted_subclass = ik->constants()->klass_name_at(cp_index)->as_C_string();
ss.print(" - resolution of permitted subclass %s failed: ", permitted_subclass);
java_lang_Throwable::print(PENDING_EXCEPTION, &ss);
log_trace(class, sealed)("%s", ss.as_string());
}
CLEAR_PENDING_EXCEPTION; CLEAR_PENDING_EXCEPTION;
continue; continue;
} }
if (k->is_instance_klass()) { if (k->is_instance_klass()) {
result->obj_at_put(count++, k->java_mirror()); result->obj_at_put(count++, k->java_mirror());
log_trace(class, sealed)(" - [%d] = %s", count, k->external_name());
} }
} }
if (count < length) { if (count < length) {
// we had invalid entries so we need to compact the array
objArrayOop r2 = oopFactory::new_objArray(SystemDictionary::Class_klass(), objArrayOop r2 = oopFactory::new_objArray(SystemDictionary::Class_klass(),
count, CHECK_NULL); count, CHECK_NULL);
objArrayHandle result2(THREAD, r2); objArrayHandle result2(THREAD, r2);