Merge pull request #20829 from JasonFengJ9/jdk24win

Fix JDK24 Windows unresolved external symbols
eclipse-openj9 · Dec 12, 2024 · 6d451b1 · 6d451b1
2 parents ac5f9b2 + 49f63be
commit 6d451b1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/runtime/j9vm/exports.cmake b/runtime/j9vm/exports.cmake
@@ -144,8 +144,6 @@ jvm_add_exports(jvm
 	post_block
 	pre_block
 	# Additions for Java 7
-	_JVM_GetStackAccessControlContext@8
-	_JVM_GetInheritedAccessControlContext@8
 	_JVM_GetArrayLength@8
 	_JVM_GetArrayElement@12
 	_JVM_GetStackTraceElement@12
@@ -466,6 +464,8 @@ endif()
 if(JAVA_SPEC_VERSION LESS 24)
 	jvm_add_exports(jvm
 		_JVM_GetClassContext@4
+		_JVM_GetInheritedAccessControlContext@8
+		_JVM_GetStackAccessControlContext@8
 	)
 else()
 	jvm_add_exports(jvm

diff --git a/runtime/j9vm/j9vmnatives.xml b/runtime/j9vm/j9vmnatives.xml
@@ -160,8 +160,12 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<export name="pre_block" />
 
 		<!-- Additions for Java 7 -->
-		<export name="_JVM_GetStackAccessControlContext@8"/>
-		<export name="_JVM_GetInheritedAccessControlContext@8"/>
+		<export name="_JVM_GetStackAccessControlContext@8">
+			<exclude-if condition="spec.java24"/>
+		</export>
+		<export name="_JVM_GetInheritedAccessControlContext@8">
+			<exclude-if condition="spec.java24"/>
+		</export>
 		<export name="_JVM_GetArrayLength@8"/>
 		<export name="_JVM_GetArrayElement@12"/>
 		<export name="_JVM_GetStackTraceElement@12"/>

diff --git a/runtime/jcl/exports.cmake b/runtime/jcl/exports.cmake
@@ -374,8 +374,6 @@ omr_add_exports(jclse
 	Java_java_lang_reflect_Proxy_defineClass0__Ljava_lang_ClassLoader_2Ljava_lang_String_2_3BII
 	Java_java_lang_reflect_Proxy_defineClass0__Ljava_lang_ClassLoader_2Ljava_lang_String_2_3BIILjava_lang_Object_2_3Ljava_lang_Object_2Ljava_lang_Object_2
 	Java_java_lang_reflect_Proxy_defineClassImpl
-	Java_java_security_AccessController_getAccSnapshot
-	Java_java_security_AccessController_getCallerPD
 	Java_java_util_stream_IntPipeline_promoteGPUCompile
 	Java_jdk_internal_misc_Unsafe_allocateDBBMemory
 	Java_jdk_internal_misc_Unsafe_copySwapMemory0
@@ -456,6 +454,8 @@ endif()
 
 if(JAVA_SPEC_VERSION LESS 24)
 omr_add_exports(jclse
+	Java_java_security_AccessController_getAccSnapshot
+	Java_java_security_AccessController_getCallerPD
 	Java_java_security_AccessController_initializeInternal
 )
 endif()

diff --git a/runtime/jcl/uma/se6_vm-side_natives_exports.xml b/runtime/jcl/uma/se6_vm-side_natives_exports.xml
@@ -299,8 +299,12 @@
 	<export name="Java_java_lang_Thread_suspendImpl">
 		<exclude-if condition="spec.java20" />
 	</export>
-	<export name="Java_java_security_AccessController_getAccSnapshot" />
-	<export name="Java_java_security_AccessController_getCallerPD" />
+	<export name="Java_java_security_AccessController_getAccSnapshot">
+		<exclude-if condition="spec.java24"/>
+	</export>
+	<export name="Java_java_security_AccessController_getCallerPD">
+		<exclude-if condition="spec.java24"/>
+	</export>
 	<export name="JCL_OnLoad" />
 	<export name="JNI_OnUnload" />
 	<export name="JVM_OnLoad" />

diff --git a/runtime/oti/jclprots.h b/runtime/oti/jclprots.h
@@ -921,8 +921,10 @@ jobject JNICALL Java_java_lang_reflect_Array_multiNewArrayImpl(JNIEnv *env, jcla
 /* java_lang_Class.c */
 jobject JNICALL Java_java_lang_Class_getDeclaredAnnotationsData(JNIEnv *env, jobject jlClass);
 jobject JNICALL Java_java_lang_Class_getStackClasses(JNIEnv *env, jclass jlHeapClass, jint maxDepth, jboolean stopAtPrivileged);
+#if JAVA_SPEC_VERSION < 24
 jobject JNICALL Java_java_security_AccessController_getAccSnapshot(JNIEnv* env, jclass jsAccessController, jint startingFrame, jboolean forDoPrivilegedWithCombiner);
 jobject JNICALL Java_java_security_AccessController_getCallerPD(JNIEnv* env, jclass jsAccessController, jint startingFrame);
+#endif /* JAVA_SPEC_VERSION < 24 */
 jobject JNICALL Java_com_ibm_oti_vm_VM_getClassNameImpl(JNIEnv *env, jclass recv, jclass jlClass, jboolean internAndAssign);
 jobject JNICALL Java_java_lang_Class_getDeclaredFieldImpl(JNIEnv *env, jobject recv, jstring jname);
 jarray JNICALL Java_java_lang_Class_getDeclaredFieldsImpl(JNIEnv *env, jobject recv);