Don't assume lockword of class is at index 0

With valuetypes it's possible for the lockword not to be the first field. Signed-off-by: Theresa Mammarella <[email protected]>
eclipse-openj9 · Nov 21, 2024 · c9599cd · c9599cd
1 parent abfb92f
commit c9599cd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/runtime/jcl/common/java_lang_invoke_MethodHandleNatives.cpp b/runtime/jcl/common/java_lang_invoke_MethodHandleNatives.cpp
@@ -1368,8 +1368,12 @@ Java_java_lang_invoke_MethodHandleNatives_resolve(
 					target = (jlong)offset;
 				}
 			}
-
+#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
+			/* In project Valhalla fields may start at offset 0. */
+			if ((NULL != new_clazz) && ((0 != vmindex) || J9_ARE_ANY_BITS_SET(flags, MN_IS_METHOD | MN_IS_CONSTRUCTOR))) {
+#else /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
 			if ((0 != target) && ((0 != vmindex) || J9_ARE_ANY_BITS_SET(flags, MN_IS_METHOD | MN_IS_CONSTRUCTOR))) {
+#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
 				/* Refetch reference after GC point */
 				membernameObject = J9_JNI_UNWRAP_REFERENCE(self);
 				if (addMemberNameToClass(currentThread, membernameObject, new_clazz)) {