Merge pull request #16019 from hangshao0/master

Add JVM_IsValhallaEnabled() for Valhalla builds
eclipse-openj9 · Sep 29, 2022 · 199cd71 · 199cd71
2 parents 5a8ae64 + b2b75c7
commit 199cd71
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/runtime/j9vm/exports.cmake b/runtime/j9vm/exports.cmake
@@ -418,3 +418,9 @@ if(J9VM_OPT_JITSERVER)
 		JITServer_CreateServer
 	)
 endif()
+
+if(J9VM_OPT_VALHALLA_VALUE_TYPES)
+	jvm_add_exports(jvm
+		JVM_IsValhallaEnabled
+	)
+endif()
diff --git a/runtime/j9vm/j9vmnatives.xml b/runtime/j9vm/j9vmnatives.xml
@@ -318,6 +318,11 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
 		<export name="_JVM_CopySwapMemory@44"/>
 		<export name="JVM_BeforeHalt"/>
 		<export name="AsyncGetCallTrace"/>
+
+		<!-- Additions for Valhalla -->
+		<export name="JVM_IsValhallaEnabled">
+			<include-if condition="spec.flags.opt_valhallaValueTypes"/>
+		</export>
 	</exports>
 
 	<exports group="jdk11">

diff --git a/runtime/j9vm/javanextvmi.cpp b/runtime/j9vm/javanextvmi.cpp
@@ -445,4 +445,12 @@ JVM_VirtualThreadHideFrames(JNIEnv *env, jobject vthread, jboolean hide)
 }
 #endif /* JAVA_SPEC_VERSION >= 20 */
 
+#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
+JNIEXPORT jboolean JNICALL
+JVM_IsValhallaEnabled()
+{
+	return JNI_TRUE;
+}
+#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
+
 } /* extern "C" */
diff --git a/runtime/redirector/forwarders.m4 b/runtime/redirector/forwarders.m4
@@ -404,3 +404,5 @@ _IF([JAVA_SPEC_VERSION >= 20],
 	[_X(JVM_GetClassFileVersion, JNICALL, false, jint, JNIEnv *env, jclass cls)])
 _IF([JAVA_SPEC_VERSION >= 20],
 	[_X(JVM_VirtualThreadHideFrames, JNICALL, false, void, JNIEnv *env, jobject vthread, jboolean hide)])
+_IF([defined(J9VM_OPT_VALHALLA_VALUE_TYPES)],
+	[_X(JVM_IsValhallaEnabled, JNICALL, false, jboolean, void)])