From a84afdcbb06a7c53d59bfeb9d1c53c2baac036fc Mon Sep 17 00:00:00 2001 From: Frederic Parain Date: Thu, 18 Dec 2025 15:27:05 -0500 Subject: [PATCH] Renaming of null_marker_offset(int index) --- src/hotspot/share/oops/instanceKlass.hpp | 2 +- src/hotspot/share/prims/unsafe.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp index a5a0817c3e3..bc4b1ff2fad 100644 --- a/src/hotspot/share/oops/instanceKlass.hpp +++ b/src/hotspot/share/oops/instanceKlass.hpp @@ -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; diff --git a/src/hotspot/share/prims/unsafe.cpp b/src/hotspot/share/prims/unsafe.cpp index 4e54c3480b5..98f30735219 100644 --- a/src/hotspot/share/prims/unsafe.cpp +++ b/src/hotspot/share/prims/unsafe.cpp @@ -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)) {