debug

Signed-off-by: Tobi Ajila <[email protected]>

Author: tajila

jcl/src/java.base/share/classes/com/ibm/oti/vm/VM.java

@@ -631,7 +631,7 @@ public static int markCurrentThreadAsSystem()
  * constantpool associated with clazz
  */
 public static ConstantPool getConstantPoolFromAnnotationBytes(Class<?> clazz, byte[] array) {
-	/* Check the cp cache on the Class object first */
+	/* Check the cp cache on the Class object first. */
 	ConstantPool cp = VM.getVMLangAccess().getConstantPoolCache(clazz);
 	if (null != cp) {
 		return cp;

jcl/src/java.base/share/classes/com/ibm/oti/vm/VMLangAccess.java

@@ -214,7 +214,7 @@ public interface VMLangAccess {
 	/*[ENDIF] JAVA_SPEC_VERSION >= 11*/
 
 	/**
-	 * Returns a cached constantPool Object from a given java.lang.Class
+	 * Returns a cached constantPool Object from a given java.lang.Class.
 	 *
 	 * @param clazz
 	 *

runtime/cmake/platform/toolcfg/gnu.cmake

@@ -20,7 +20,7 @@
 # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
 ################################################################################
 
-list(APPEND OMR_PLATFORM_COMPILE_OPTIONS -O3 -g -fstack-protector)
+list(APPEND OMR_PLATFORM_COMPILE_OPTIONS -O0 -g3 -fstack-protector)
 if(OMR_DDR AND NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 11))
 	# In gcc 11+ the default is to use DWARF version 5 which is not yet
 	# supported by ddrgen: tell the compiler to use DWARF version 4.

runtime/jcl/common/com_ibm_oti_vm_VM.cpp

@@ -167,8 +167,8 @@ Java_com_ibm_oti_vm_VM_markCurrentThreadAsSystemImpl(JNIEnv *env)
 jlong JNICALL
 Java_com_ibm_oti_vm_VM_getJ9ConstantPoolFromJ9Class(JNIEnv *env, jclass unused, jlong j9clazz)
 {
-	J9Class *clazz = (J9Class *)JLONG_TO_POINTER(j9clazz);
-	return JLONG_FROM_POINTER(clazz->ramConstantPool);
+	J9Class *clazz = (J9Class *)(UDATA)j9clazz;
+	return (jlong)(UDATA)clazz->ramConstantPool;
 }
 
 /**

runtime/jcl/common/java_lang_Access.c

@@ -67,8 +67,7 @@ Java_java_lang_Access_getConstantPool(JNIEnv *env, jclass unusedClass, jobject c
 	vmFunctions->internalEnterVMFromJNI(vmThread);
 	classObject = J9_JNI_UNWRAP_REFERENCE(classToIntrospect);
 	if (J9VMJAVALANGCLASS_OR_NULL(vmThread->javaVM) == J9OBJECT_CLAZZ(vmThread, classObject)) {
-		clazz = J9VM_J9CLASS_FROM_HEAPCLASS(vmThread, classObject);
-		J9ConstantPool *j9CP = (J9ConstantPool *)clazz->ramConstantPool;
+		J9ConstantPool *j9CP = NULL;
 		J9Class *internalConstantPool = J9VMJAVALANGINTERNALCONSTANTPOOL_OR_NULL(vmThread->javaVM);
 		Assert_JCL_notNull(internalConstantPool);
 		j9object_t internalConstantPoolObject = gcFunctions->J9AllocateObject(vmThread, internalConstantPool, J9_GC_ALLOCATE_OBJECT_NON_INSTRUMENTABLE);
@@ -77,6 +76,9 @@ Java_java_lang_Access_getConstantPool(JNIEnv *env, jclass unusedClass, jobject c
 			vmFunctions->internalExitVMToJNI(vmThread);
 			return NULL;
 		}
+		classObject = J9_JNI_UNWRAP_REFERENCE(classToIntrospect);
+		clazz = J9VM_J9CLASS_FROM_HEAPCLASS(vmThread, classObject);
+		j9CP = (J9ConstantPool *)clazz->ramConstantPool;
 		J9VMJAVALANGINTERNALCONSTANTPOOL_SET_VMREF(vmThread, internalConstantPoolObject, j9CP);
 		J9VMJAVALANGINTERNALCONSTANTPOOL_SET_CLAZZ(vmThread, internalConstantPoolObject, classObject);
 		classToIntrospect = vmFunctions->j9jni_createLocalRef(env, internalConstantPoolObject);