Skip to content

8373708: [lworld] InstanceKlass::null_marker_offset(int i) is misleading #1835

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

Open
fparain wants to merge 1 commit into
base: lworld
Choose a base branch
from
+2 −2
Open

8373708: [lworld] InstanceKlass::null_marker_offset(int i) is misleading #1835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/hotspot/share/oops/instanceKlass.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ class InstanceKlass: public Klass {
bool field_is_null_free_inline_type(int index) const;
bool is_class_in_loadable_descriptors_attribute(Symbol* name) const;

int null_marker_offset(int index) const { return inline_layout_info(index).null_marker_offset(); }
int field_null_marker_offset(int index) const { return inline_layout_info(index).null_marker_offset(); }

// Number of Java declared fields
int java_fields_count() const;
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/prims/unsafe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ UNSAFE_ENTRY(jint, Unsafe_NullMarkerOffset(JNIEnv *env, jobject unsafe, jobject
oop f = JNIHandles::resolve_non_null(o);
Klass* k = java_lang_Class::as_Klass(java_lang_reflect_Field::clazz(f));
int slot = java_lang_reflect_Field::slot(f);
return InstanceKlass::cast(k)->null_marker_offset(slot);
return InstanceKlass::cast(k)->field_null_marker_offset(slot);
} UNSAFE_END

UNSAFE_ENTRY(jint, Unsafe_ArrayLayout(JNIEnv *env, jobject unsafe, jarray array)) {
Expand Down