Merge pull request eclipse-openj9#19857 from tajila/asgct

Clear jni ids on anonClass unload

Author: gacholio

runtime/oti/j9.h

@@ -416,4 +416,9 @@ static_assert((LITERAL_STRLEN(J9_UNMODIFIABLE_CLASS_ANNOTATION) < (size_t)'/'),
 #endif /* __cplusplus */
 #endif /* 0 */
 
+#define J9VM_NUM_OF_ENTRIES_IN_CLASS_JNIID_TABLE(romclass) ((romclass)->romMethodCount + (romclass)->romFieldCount)
+
+#define J9VM_SHOULD_CLEAR_JNIIDS_FOR_ASGCT(vm, classLoader) (J9_ARE_NO_BITS_SET((vm)->extendedRuntimeFlags2, J9_EXTENDED_RUNTIME2_NEVER_KEEP_JNI_IDS) \
+		&& ((classLoader)->asyncGetCallTraceUsed || J9_ARE_ANY_BITS_SET((vm)->extendedRuntimeFlags2, J9_EXTENDED_RUNTIME2_ALWAYS_KEEP_JNI_IDS)))
+
 #endif /* J9_H */

runtime/vm/classallocation.c

@@ -208,7 +208,7 @@ allocateClassLoader(J9JavaVM *javaVM)
 }
 
 
-void  
+void
 freeClassLoader(J9ClassLoader *classLoader, J9JavaVM *javaVM, J9VMThread *vmThread, UDATA needsFrameBuild)
 {
 #ifdef J9VM_GC_DYNAMIC_CLASS_UNLOADING
@@ -259,7 +259,7 @@ freeClassLoader(J9ClassLoader *classLoader, J9JavaVM *javaVM, J9VMThread *vmThre
 			classLoader->hotFieldPoolMutex = NULL;
 		}
 	}
-	
+
 	/* free the class path entries allocated for system and non-system class loaders */
 	if (javaVM->systemClassLoader == classLoader) {
 		if (NULL != classLoader->classPathEntries) {
@@ -300,7 +300,7 @@ freeClassLoader(J9ClassLoader *classLoader, J9JavaVM *javaVM, J9VMThread *vmThre
 		if (NULL != nativeLibrary) {
 			Assert_VM_mustHaveVMAccess(vmThread);
 		}
-		
+
 		while (NULL != nativeLibrary) {
 			BOOLEAN unloadPerformed = FALSE;
 
@@ -385,9 +385,7 @@ freeClassLoader(J9ClassLoader *classLoader, J9JavaVM *javaVM, J9VMThread *vmThre
 	}
 
 	if (NULL != classLoader->jniIDs) {
-		if (J9_ARE_NO_BITS_SET(javaVM->extendedRuntimeFlags2, J9_EXTENDED_RUNTIME2_NEVER_KEEP_JNI_IDS)
-		&& (classLoader->asyncGetCallTraceUsed || J9_ARE_ANY_BITS_SET(javaVM->extendedRuntimeFlags2, J9_EXTENDED_RUNTIME2_ALWAYS_KEEP_JNI_IDS))
-		) {
+		if (J9VM_SHOULD_CLEAR_JNIIDS_FOR_ASGCT(javaVM, classLoader)) {
 			pool_state idWalkState;
 			J9GenericJNIID *jniID = pool_startDo(classLoader->jniIDs, &idWalkState);
 
@@ -419,7 +417,7 @@ freeClassLoader(J9ClassLoader *classLoader, J9JavaVM *javaVM, J9VMThread *vmThre
 			moduleExtraInfoPtr = (J9ModuleExtraInfo *)hashTableNextDo(&moduleExtraInfoWalkState);
 		}
 		hashTableFree(classLoader->moduleExtraInfoHashTable);
-		classLoader->moduleExtraInfoHashTable = NULL;	
+		classLoader->moduleExtraInfoHashTable = NULL;
 	}
 	if (NULL != classLoader->classLocationHashTable) {
 		hashTableFree(classLoader->classLocationHashTable);

runtime/vm/jnicsup.cpp

@@ -383,7 +383,7 @@ JNICALL throwNew(JNIEnv *env, jclass clazz, const char *message)
 {
 	jmethodID constructor;
 	jobject throwable;
-	
+
 	if (message) {
 		jstring messageObject;
 		constructor = getMethodID(env, clazz, "<init>", "(Ljava/lang/String;)V");
@@ -470,7 +470,7 @@ void JNICALL gpCheckInitialize(J9VMThread* env, J9Class* clazz)
 
 
 
-void   
+void
 gpCheckCallin(JNIEnv *env, jobject receiver, jclass cls, jmethodID methodID, void* args)
 {
 	J9RedirectedCallInArgs handlerArgs;
@@ -1882,9 +1882,9 @@ getMethodOrFieldID(JNIEnv *env, jclass classReference, const char *name, const c
 				UDATA inconsistentData = 0;
 				id = getJNIFieldID(vmThread, declaringClass, (J9ROMFieldShape *) element, offset, &inconsistentData);
 				if (0 != inconsistentData) {
-					/* declaringClass->romClass & element are inconsistent due to 
+					/* declaringClass->romClass & element are inconsistent due to
 					 * class redefinition. Retry the operation and hope a redefinition
-					 * doesn't occur again 
+					 * doesn't occur again
 					 */
 					goto retry;
 				}
@@ -2056,8 +2056,8 @@ monitorEnter(JNIEnv* env, jobject obj)
 #if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
 			if (J9_IS_J9CLASS_VALUETYPE(badClass)) {
 				setCurrentExceptionNLSWithArgs(vmThread, J9NLS_VM_ERROR_BYTECODE_OBJECTREF_CANNOT_BE_VALUE_TYPE, J9VMCONSTANTPOOL_JAVALANGIDENTITYEXCEPTION, J9UTF8_LENGTH(badClassName), J9UTF8_DATA(badClassName));
-			} else 
-#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */		
+			} else
+#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
 			{
 				Assert_VM_true(J9_ARE_ALL_BITS_SET(vmThread->javaVM->extendedRuntimeFlags2, J9_EXTENDED_RUNTIME2_VALUE_BASED_EXCEPTION));
 				setCurrentExceptionNLSWithArgs(vmThread, J9NLS_VM_ERROR_BYTECODE_OBJECTREF_CANNOT_BE_VALUE_BASED, J9VMCONSTANTPOOL_JAVALANGVIRTUALMACHINEERROR, J9UTF8_LENGTH(badClassName), J9UTF8_DATA(badClassName));
@@ -2159,7 +2159,7 @@ ensureJNIIDTable(J9VMThread *currentThread, J9Class* clazz)
 	jniIDs = clazz->jniIDs;
 	if (jniIDs == NULL) {
 		J9ROMClass * romclass = clazz->romClass;
-		UDATA size = (romclass->romMethodCount + romclass->romFieldCount) * sizeof(void *);
+		UDATA size = J9VM_NUM_OF_ENTRIES_IN_CLASS_JNIID_TABLE(romclass) * sizeof(void *);
 
 		jniIDs = (void**)j9mem_allocate_memory(size, J9MEM_CATEGORY_JNI);
 		if (jniIDs != NULL) {
@@ -2470,7 +2470,7 @@ getModule(JNIEnv *env, jclass clazz)
 {
 	J9VMThread *vmThread = (J9VMThread *) env;
 	jobject module = NULL;
-	
+
 	VM_VMAccess::inlineEnterVMFromJNI(vmThread);
 	if (NULL == clazz) {
 		setCurrentExceptionUTF(vmThread, J9VMCONSTANTPOOL_JAVALANGNULLPOINTEREXCEPTION, NULL);
@@ -2688,7 +2688,7 @@ defineClass(JNIEnv *env, const char *name, jobject loader, const jbyte *buf, jsi
 					}
 				}
 			}
-			
+
 			result = (jclass)VM_VMHelpers::createLocalRef(env, J9VM_J9CLASS_TO_HEAPCLASS(clazz));
 		}
 

runtime/vm/jvminit.c

@@ -233,9 +233,7 @@ void sidecarExit(J9VMThread* shutdownThread);
 static jint runLoadStage (J9JavaVM *vm, IDATA flags);
 #if defined(J9VM_GC_DYNAMIC_CLASS_UNLOADING)
 static void freeClassNativeMemory (J9HookInterface** hook, UDATA eventNum, void* eventData, void* userData);
-#if JAVA_SPEC_VERSION >= 22
 static void vmHookAnonClassesUnload(J9HookInterface** hook, UDATA eventNum, void* eventData, void* userData);
-#endif /* JAVA_SPEC_VERSION >= 22 */
 #endif /* GC_DYNAMIC_CLASS_UNLOADING */
 static jint runShutdownStage (J9JavaVM* vm, IDATA stage, void* reserved, UDATA filterFlags);
 static jint modifyDllLoadTable (J9JavaVM * vm, J9Pool* loadTable, J9VMInitArgs* j9vm_args);
@@ -7533,9 +7531,7 @@ protectedInitializeJavaVM(J9PortLibrary* portLibrary, void * userData)
 #if defined(J9VM_GC_DYNAMIC_CLASS_UNLOADING)
 	vmHooks = getVMHookInterface(vm);
 	if(0 != (*vmHooks)->J9HookRegisterWithCallSite(vmHooks, J9HOOK_VM_CLASS_UNLOAD, freeClassNativeMemory, OMR_GET_CALLSITE(), NULL)
-#if JAVA_SPEC_VERSION >= 22
 		|| 0 != (*vmHooks)->J9HookRegisterWithCallSite(vmHooks, J9HOOK_VM_ANON_CLASSES_UNLOAD, vmHookAnonClassesUnload, OMR_GET_CALLSITE(), NULL)
-#endif /* JAVA_SPEC_VERSION >= 22 */
 	) {
 		goto error;
 	}
@@ -8157,17 +8153,30 @@ freeClassNativeMemory(J9HookInterface** hook, UDATA eventNum, void* eventData, v
 #endif /* defined(J9VM_OPT_OPENJDK_METHODHANDLE) */
 }
 
-#if JAVA_SPEC_VERSION >= 22
+
 static void
 vmHookAnonClassesUnload(J9HookInterface** hook, UDATA eventNum, void* eventData, void* userData)
 {
 	J9VMAnonymousClassesUnloadEvent * unloadedEvent = (J9VMAnonymousClassesUnloadEvent *)eventData;
 	J9VMThread * vmThread = unloadedEvent->currentThread;
+	J9JavaVM *vm = vmThread->javaVM;
 	for (J9Class* j9clazz = unloadedEvent->anonymousClassesToUnload; j9clazz; j9clazz = j9clazz->gcLink) {
+		/* AnonClass->classLoader points to the hostclass->classLoader not the anonClassLoader. */
+		if (J9VM_SHOULD_CLEAR_JNIIDS_FOR_ASGCT(vm, j9clazz->classLoader)) {
+			void **jniIDs = j9clazz->jniIDs;
+			if (NULL != jniIDs) {
+				UDATA size = J9VM_NUM_OF_ENTRIES_IN_CLASS_JNIID_TABLE(j9clazz->romClass);
+				for (UDATA i = 0; i < size; i++) {
+					J9GenericJNIID *id = (J9GenericJNIID*)(jniIDs[i]);
+					memset(id, -1, sizeof(J9GenericJNIID));
+				}
+			}
+		}
+#if JAVA_SPEC_VERSION >= 22
 		hashClassTablePackageDelete(vmThread, j9clazz->classLoader, j9clazz->romClass);
+#endif /* JAVA_SPEC_VERSION >= 22 */
 	}
 }
-#endif /* JAVA_SPEC_VERSION >= 22 */
 
 #endif /* GC_DYNAMIC_CLASS_UNLOADING */