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
 	 *

jcl/src/java.base/share/classes/java/lang/InternalConstantPool.java

@@ -22,6 +22,8 @@
  * 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
  */
 
+import com.ibm.oti.vm.VM;
+
 /**
  * Represents the internal J9ConstantPool
  *
@@ -34,5 +36,6 @@ final class InternalConstantPool {
 	public InternalConstantPool(long addr, Class<?> clazz) {
 		this.vmRef = addr;
 		this.clazz = clazz;
+		VM.dumpString("addr: " + addr + " clazz: " + clazz.getName());
 	}
 }

runtime/include/ffi_cfi.h

@@ -7,6 +7,8 @@
 #ifndef FFI_CFI_H
 #define FFI_CFI_H
 
+#undef HAVE_AS_CFI_PSEUDO_OP
+
 #ifdef HAVE_AS_CFI_PSEUDO_OP
 
 # define cfi_startproc			.cfi_startproc

runtime/jcl/common/com_ibm_oti_vm_VM.cpp

@@ -167,8 +167,10 @@ 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;
+
+	Trc_JCL_accessCPEntry2((J9VMThread*)env, clazz, clazz->ramConstantPool);
+	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,9 +76,13 @@ 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);
+		Trc_JCL_accessCPEntry(vmThread, J9_JNI_UNWRAP_REFERENCE(constantPool), J9_JNI_UNWRAP_REFERENCE(classToIntrospect), clazz, j9CP);
 	}
 
 #if JAVA_SPEC_VERSION == 8

runtime/jcl/j9jcl.tdf

@@ -1,5 +1,5 @@
 // Copyright IBM Corp. and others 2006
-//	
+//
 // This program and the accompanying materials are made available under
 // the terms of the Eclipse Public License 2.0 which accompanies this
 // distribution and is available at https://www.eclipse.org/legal/epl-2.0/
@@ -506,7 +506,7 @@ TraceExit=Trc_JCL_com_ibm_tenant_TenantContext_bindToAllocationContext_Exit Obso
 
 TraceAssert=Assert_JCL_Natives_Not_Offloaded noEnv Overhead=1 Level=1 Assert="(0 /* unreachable */)"
 
-TraceEvent=Trc_JCL_com_ibm_oti_vm_VM_dumpString Group=verboseclass Overhead=1 Level=3 Template="com_ibm_oti_vm_VM_dumpString: %s"
+TraceEvent=Trc_JCL_com_ibm_oti_vm_VM_dumpString Group=verboseclass Overhead=1 Level=1 Template="com_ibm_oti_vm_VM_dumpString: %s"
 
 
 TraceEntry=Trc_JCL_com_ibm_tenant_TenantContext_freeze_Entry Obsolete Overhead=1 Level=1 Template="com_ibm_tenant_TenantContext_freeze(tenantRef=%p)"
@@ -715,3 +715,5 @@ TraceExit=Trc_JCL_com_ibm_oti_shared_getCpeTypeForProtocol_ExitFail3 Noenv Overh
 TraceEntry=Trc_JCL_com_ibm_oti_shared_getCachedURL_Entry_1 Overhead=1 Level=2 Template="JCL: com.ibm.oti.shared getCachedURL: Entering for helperID=%d"
 
 TraceEvent=Trc_JCL_signal_pid noEnv Overhead=1 Level=1 Template="%s received from process id %zu name '%s'"
+TraceEvent=Trc_JCL_accessCPEntry Overhead=1 Level=1 Template="Java_java_lang_Access_getConstantPool cpObject=%p internalCPOject=%p clazz=%p cp=%p"
+TraceEvent=Trc_JCL_accessCPEntry2 Overhead=1 Level=1 Template="Java_com_ibm_oti_vm_VM_getJ9ConstantPoolFromJ9Class clazz=%p cp=%p"