Merge pull request #21163 from eclipse-openj9/revert-21153-pmr

Revert "Add unused macro to access barrier helpers"
eclipse-openj9 · Feb 20, 2025 · 5626ff4 · 5626ff4
2 parents 04d2901 + 560d393
commit 5626ff4
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/runtime/oti/j9accessbarrierhelpers.h b/runtime/oti/j9accessbarrierhelpers.h
@@ -71,8 +71,7 @@ static UDATA j9javaArray_BA(J9VMThread *vmThread, J9IndexableObject *array, UDAT
 }
 
 #define J9JAVAARRAY_C_EA(elemType)																					\
-__attribute__ ((__unused__)) VMINLINE static elemType																\
-*j9javaArray_##elemType##_EA(J9VMThread *vmThread, J9IndexableObject *array, UDATA index)							\
+VMINLINE static elemType *j9javaArray_##elemType##_EA(J9VMThread *vmThread, J9IndexableObject *array, UDATA index)	\
 {																													\
 	UDATA baseAddress = j9javaArray_BA(vmThread, array, &index, (U_8)sizeof(elemType));								\
 	/* Intentionally inlining this to treat sizeof value as an immediate value */									\
@@ -108,10 +107,10 @@ J9JAVAARRAY_C_EA(UDATA)
  * Note that Microsoft compilers do not allow this attribute.
  */
 VMINLINE static j9object_t
-j9javaArrayOfObject_load(J9VMThread *vmThread, J9IndexableObject *array, I_32 index) __attribute__ ((__unused__));
+j9javaArrayOfObject_load(J9VMThread *vmThread, J9IndexableObject *array, I_32 index)   __attribute__ ((__unused__));
 
 VMINLINE static j9object_t
-j9javaArrayOfObject_load_VM(J9JavaVM *vm, J9IndexableObject *array, I_32 index) __attribute__ ((__unused__));
+j9javaArrayOfObject_load_VM(J9JavaVM *vm, J9IndexableObject *array, I_32 index)  __attribute__ ((__unused__));
 #endif /* __GNUC__ */
 
 VMINLINE static j9object_t
@@ -138,7 +137,7 @@ j9javaArrayOfObject_load_VM(J9JavaVM *vm, J9IndexableObject *array, I_32 index)
 	} else {
 		UDATA *loadAddress = J9JAVAARRAY_EA_VM(vm, array, index, UDATA);
 		J9OBJECT__PRE_OBJECT_LOAD_ADDRESS_VM(vm, array, loadAddress);
-		return (j9object_t)*loadAddress;
+		return (j9object_t)*loadAddress;	
 	}
 }