Skip to content

8349860: Make Class.isArray(), Class.isInterface() and Class.isPrimitive() non-native #23572

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 12 commits into from
Closed

8349860: Make Class.isArray(), Class.isInterface() and Class.isPrimitive() non-native #23572

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f0133fc
Make isArray non-native
coleenp Feb 10, 2025
072f332
Make isInterface non-native.
coleenp Feb 10, 2025
c0e9919
Remove isPrimitive intrinsic in favor of a boolean.
coleenp Feb 11, 2025
e8119a2
Shrink modifiers flag so isPrimitive can share word.
coleenp Feb 11, 2025
2d9b9ff
Add ')' removed from jvmci test.
coleenp Feb 18, 2025
3e731b9
Code review comments.
coleenp Feb 19, 2025
d08091a
Rename isPrimitiveType field to primitive.
coleenp Feb 19, 2025
7a4c595
Update src/java.base/share/classes/java/lang/Class.java
coleenp Feb 20, 2025
0234743
Fix whitespace
coleenp Feb 20, 2025
c23718b
Remove JVM_GetClassModifiers from jvm.h too.
coleenp Feb 21, 2025
db7c978
Use modifiers field directly in isInterface.
coleenp Feb 22, 2025
591abdd
Add a comment about Class constructor.
coleenp Feb 24, 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
10 changes: 6 additions & 4 deletions src/hotspot/share/classfile/javaClasses.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1273,8 +1273,11 @@ void java_lang_Class::set_protection_domain(oop java_class, oop pd) {

void java_lang_Class::set_component_mirror(oop java_class, oop comp_mirror) {
assert(_component_mirror_offset != 0, "must be set");
java_class->obj_field_put(_component_mirror_offset, comp_mirror);
}
assert(java_lang_Class::as_Klass(java_class) != nullptr &&
java_lang_Class::as_Klass(java_class)->is_array_klass(), "must be");
java_class->obj_field_put(_component_mirror_offset, comp_mirror);
}

oop java_lang_Class::component_mirror(oop java_class) {
assert(_component_mirror_offset != 0, "must be set");
return java_class->obj_field(_component_mirror_offset);
Expand Down Expand Up @@ -1355,8 +1358,7 @@ void java_lang_Class::set_is_primitive(oop java_class) {


oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) {
// This should be improved by adding a field at the Java level or by
// introducing a new VM klass (see comment in ClassFileParser)
// Mirrors for basic types have a null klass field, which makes them special.
oop java_class = InstanceMirrorKlass::cast(vmClasses::Class_klass())->allocate_instance(nullptr, CHECK_NULL);
if (type != T_VOID) {
Klass* aklass = Universe::typeArrayKlass(type);
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/classfile/javaClasses.inline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ inline bool java_lang_Class::is_primitive(oop java_class) {
#ifdef ASSERT
// The heapwalker walks through Classes that have had their Klass pointers removed, so can't assert this.
// assert(is_primitive == java_class->bool_field(_is_primitive_offset), "must match what we told Java");
if (is_primitive) {
if (java_class->bool_field(_is_primitive_offset)) {
Klass* k = ((Klass*)java_class->metadata_field(_array_klass_offset));
assert(k == nullptr || is_java_primitive(ArrayKlass::cast(k)->element_type()),
"Should be either the T_VOID primitive or a java primitive");
Expand Down
9 changes: 0 additions & 9 deletions src/hotspot/share/include/jvm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,15 +546,6 @@ JVM_GetClassInterfaces(JNIEnv *env, jclass cls);
JNIEXPORT jboolean JNICALL
JVM_IsInterface(JNIEnv *env, jclass cls);

JNIEXPORT jobject JNICALL
JVM_GetProtectionDomain(JNIEnv *env, jclass cls);

JNIEXPORT jboolean JNICALL
JVM_IsArrayClass(JNIEnv *env, jclass cls);

JNIEXPORT jboolean JNICALL
JVM_IsPrimitiveClass(JNIEnv *env, jclass cls);

JNIEXPORT jboolean JNICALL
JVM_IsHiddenClass(JNIEnv *env, jclass cls);

Expand Down