Merge pull request #22594 from tajila/mod2 · eclipse-openj9/openj9@41d045d
@@ -1119,7 +1119,7 @@ JVM_AddModuleExports(JNIEnv * env, jobject fromModule, const char *package, jobj
11191119#endif /* JAVA_SPEC_VERSION >= 15 */
11201120{
11211121J9VMThread * const currentThread = (J9VMThread*)env;
1122-J9JavaVM const * const vm = currentThread->javaVM;
1122+J9JavaVM * const vm = currentThread->javaVM;
11231123J9InternalVMFunctions const * const vmFuncs = vm->internalVMFunctions;
11241124#if JAVA_SPEC_VERSION >= 15
11251125const char *package = NULL;
@@ -1129,6 +1129,8 @@ JVM_AddModuleExports(JNIEnv * env, jobject fromModule, const char *package, jobj
11291129vmFuncs->internalEnterVMFromJNI(currentThread);
11301130f_monitorEnter(vm->classLoaderModuleAndLocationMutex);
113111311132+vm->extendedRuntimeFlags3 |= J9_EXTENDED_RUNTIME3_MODULE_PACKAGES_INITIALIZED;
1133+11321134#if JAVA_SPEC_VERSION >= 15
11331135if (NULL != packageObj) {
11341136j9object_t stringObject = J9_JNI_UNWRAP_REFERENCE(packageObj);
@@ -1197,7 +1199,7 @@ JVM_AddModuleExportsToAll(JNIEnv * env, jobject fromModule, const char *package)
11971199#endif /* JAVA_SPEC_VERSION >= 15 */
11981200{
11991201J9VMThread * const currentThread = (J9VMThread*)env;
1200-J9JavaVM const * const vm = currentThread->javaVM;
1202+J9JavaVM * const vm = currentThread->javaVM;
12011203J9InternalVMFunctions const * const vmFuncs = vm->internalVMFunctions;
12021204#if JAVA_SPEC_VERSION >= 15
12031205const char *package = NULL;
@@ -1207,6 +1209,8 @@ JVM_AddModuleExportsToAll(JNIEnv * env, jobject fromModule, const char *package)
12071209vmFuncs->internalEnterVMFromJNI(currentThread);
12081210f_monitorEnter(vm->classLoaderModuleAndLocationMutex);
120912111212+vm->extendedRuntimeFlags3 |= J9_EXTENDED_RUNTIME3_MODULE_PACKAGES_INITIALIZED;
1213+12101214#if JAVA_SPEC_VERSION >= 15
12111215if (NULL != packageObj) {
12121216j9object_t stringObject = J9_JNI_UNWRAP_REFERENCE(packageObj);
@@ -1420,7 +1424,7 @@ JVM_AddModuleExportsToAllUnnamed(JNIEnv * env, jobject fromModule, const char *p
14201424#endif /* JAVA_SPEC_VERSION >= 15 */
14211425{
14221426J9VMThread * const currentThread = (J9VMThread*)env;
1423-J9JavaVM const * const vm = currentThread->javaVM;
1427+J9JavaVM * const vm = currentThread->javaVM;
14241428J9InternalVMFunctions const * const vmFuncs = vm->internalVMFunctions;
14251429#if JAVA_SPEC_VERSION >= 15
14261430const char *package = NULL;
@@ -1430,6 +1434,8 @@ JVM_AddModuleExportsToAllUnnamed(JNIEnv * env, jobject fromModule, const char *p
14301434vmFuncs->internalEnterVMFromJNI(currentThread);
14311435f_monitorEnter(vm->classLoaderModuleAndLocationMutex);
143214361437+vm->extendedRuntimeFlags3 |= J9_EXTENDED_RUNTIME3_MODULE_PACKAGES_INITIALIZED;
1438+14331439#if JAVA_SPEC_VERSION >= 15
14341440if (NULL != packageObj) {
14351441j9object_t stringObject = J9_JNI_UNWRAP_REFERENCE(packageObj);