Merge pull request #9 from r30shah/setForceUsePreexistence

Add JNI Call to set ForceUsePreexistence
r30shah · Dec 9, 2021 · 2cbb232 · 2cbb232
2 parents bb0a796 + 889aefb
commit 2cbb232
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 0 deletions.
diff --git a/jcl/src/java.base/share/classes/com/ibm/jit/JITHelpers.java b/jcl/src/java.base/share/classes/com/ibm/jit/JITHelpers.java
@@ -1223,6 +1223,8 @@ public int getInitialLockword(int flags, int reservedCounter, int cancelCounter)
 
 	public static native void dispatchVirtual();
 
+	public static native void setForceUsePreexistence();
+
 	private native static final void debugAgentRun(MethodAccessor ma, Object obj, Object[] args);
 
 	/**

diff --git a/jcl/src/java.base/share/classes/module-info.java.extra b/jcl/src/java.base/share/classes/module-info.java.extra
@@ -37,6 +37,7 @@ exports com.ibm.oti.util to java.management, jdk.attach, jdk.jcmd, jdk.managemen
 exports openj9.internal.tools.attach.target to jdk.attach, jdk.jcmd, jdk.management;
 exports openj9.management.internal to java.management, openj9.jvm;
 exports openj9.internal.management to java.management;
+exports com.ibm.jit;
 exports jdk.internal.org.objectweb.asm to openj9.dtfj, openj9.dtfjview;
 // Following allows dtfj/dtfjview modules invoke module addReads & addExports programmatically via reflection APIs
 exports jdk.internal.module to openj9.dtfj, openj9.dtfjview;

diff --git a/runtime/compiler/control/DebugAgent.cpp b/runtime/compiler/control/DebugAgent.cpp
@@ -35,6 +35,12 @@
 #include <queue>
 #include <set>
 
+void
+debugAgentSetForceUsePreexistence(J9VMThread* vmThread)
+    {
+    TR::Options::getCmdLineOptions()->setOption(TR_ForceUsePreexistence);
+    }
+
 BOOLEAN
 debugAgentStart(J9VMThread* vmThread)
     {

diff --git a/runtime/compiler/control/DebugAgent.hpp b/runtime/compiler/control/DebugAgent.hpp
@@ -27,6 +27,9 @@
 #include "j9nonbuilder.h"
 #include "jni.h"
 
+extern J9_CFUNC void
+debugAgentSetForceUsePreexistence(J9VMThread* vmThread);
+
 extern J9_CFUNC BOOLEAN
 debugAgentStart(J9VMThread* vmThread);
 

diff --git a/runtime/compiler/control/rossa.cpp b/runtime/compiler/control/rossa.cpp
@@ -1820,6 +1820,7 @@ onLoadInternal(
    jitConfig->debugAgentRevertToInterpreter = debugAgentRevertToInterpreter;
    jitConfig->debugAgentRecompile = debugAgentRecompile;
    jitConfig->debugAgentEnd = debugAgentEnd;
+   jitConfig->debugAgentSetForceUsePreexistence = debugAgentSetForceUsePreexistence;
 
    jitConfig->printAOTHeaderProcessorFeatures = printAOTHeaderProcessorFeatures;
 

diff --git a/runtime/jcl/common/jithelpers.c b/runtime/jcl/common/jithelpers.c
@@ -462,6 +462,14 @@ Java_com_ibm_jit_JITHelpers_getClassFlagsFromJ9Class32(JNIEnv *env, jobject rcv,
 
 #endif
 
+void JNICALL
+Java_com_ibm_jit_JITHelpers_setForceUsePreexistence(JNIEnv* env, jclass ignored)
+{
+	J9VMThread *vmThread = (J9VMThread *)env;
+	J9JITConfig *jitConfig = vmThread->javaVM->jitConfig;
+	jitConfig->debugAgentSetForceUsePreexistence(vmThread);
+}
+
 void JNICALL		
 Java_com_ibm_jit_JITHelpers_debugAgentRun(JNIEnv *env, jclass ignored, jobject ma, jobject obj, jobjectArray args)
 {	

diff --git a/runtime/jcl/exports.cmake b/runtime/jcl/exports.cmake
@@ -143,6 +143,7 @@ omr_add_exports(jclse
 	Java_com_ibm_jit_JITHelpers_objectHeaderHasBeenHashedInClass
 	Java_com_ibm_jit_JITHelpers_objectHeaderHasBeenMovedInClass
 	Java_com_ibm_jit_JITHelpers_debugAgentRun
+	Java_com_ibm_jit_JITHelpers_setForceUsePreexistence
 	Java_com_ibm_jvm_Dump_HeapDumpImpl
 	Java_com_ibm_jvm_Dump_JavaDumpImpl
 	Java_com_ibm_jvm_Dump_SnapDumpImpl

diff --git a/runtime/jcl/uma/jithelpers_jni_exports.xml b/runtime/jcl/uma/jithelpers_jni_exports.xml
@@ -126,4 +126,5 @@
 		<exclude-if condition="spec.flags.env_data64"/>
 	</export>
 	<export name="Java_com_ibm_jit_JITHelpers_debugAgentRun" />
+	<export name="Java_com_ibm_jit_JITHelpers_setForceUsePreexistence" />
 </exports>
diff --git a/runtime/oti/j9nonbuilder.h b/runtime/oti/j9nonbuilder.h
@@ -4037,6 +4037,7 @@ typedef struct J9JITConfig {
 	BOOLEAN (*debugAgentRevertToInterpreter)(struct J9VMThread *vmThread, J9JITExceptionTable *jitMethod);
 	BOOLEAN (*debugAgentRecompile)(struct J9VMThread *vmThread, J9JITExceptionTable *jitMethod, IDATA lastOptIndex, IDATA lastOptSubIndex, BOOLEAN enableTracing, BOOLEAN goodLog);
 	BOOLEAN (*debugAgentEnd)(struct J9VMThread *vmThread);
+	void 	  (*debugAgentSetForceUsePreexistence)(struct J9VMThread *vmThread);
 #if defined(J9VM_OPT_JITSERVER)
 	int32_t (*startJITServer)(struct J9JITConfig *jitConfig);
 	int32_t (*waitJITServerTermination)(struct J9JITConfig *jitConfig);

diff --git a/runtime/oti/jclprots.h b/runtime/oti/jclprots.h
@@ -856,6 +856,7 @@ jint JNICALL Java_com_ibm_jit_JITHelpers_getModifiersFromRomClass32(JNIEnv *env,
 jint JNICALL Java_com_ibm_jit_JITHelpers_getClassFlagsFromJ9Class32(JNIEnv *env, jobject rcv, jint j9clazz);
 #endif /* J9VM_ENV_DATA64 */
 void JNICALL Java_com_ibm_jit_JITHelpers_debugAgentRun(JNIEnv *env, jclass ignored, jobject ma, jobject obj, jobjectArray args);
+void JNICALL Java_com_ibm_jit_JITHelpers_setForceUsePreexistence(JNIEnv *env,jclass ignored);
 
 /* crypto.c */
 jboolean JNICALL Java_com_ibm_jit_Crypto_isAESSupportedByHardware(JNIEnv *env, jobject ignored);
-Original file line number
+Diff line change
@@ Expand Up @@
     	public static native void dispatchVirtual();
+    	public static native void setForceUsePreexistence();
     	private native static final void debugAgentRun(MethodAccessor ma, Object obj, Object[] args);
     	/**
@@ Expand Down @@