Merge pull request eclipse-openj9#328 from tajila/gradle

search for loadlocationtype when calling defineclass v2

runtime/bcutil/dynload.c

@@ -58,13 +58,13 @@ static IDATA readZip (J9JavaVM * javaVM, J9ClassPathEntry * cpEntry);
 static IDATA convertToOSFilename (J9JavaVM * javaVM, U_8 * dir, UDATA dirLength, U_8 * moduleName, U_8 * className, UDATA classNameLength);
 static IDATA checkSunClassFileBuffers (J9JavaVM * javaVM, U_32 sunClassFileSize);
 static IDATA searchClassInModule(J9VMThread * vmThread, J9Module * j9module, U_8 * className, UDATA classNameLength, BOOLEAN verbose, J9TranslationLocalBuffer *localBuffer);
-static IDATA searchClassInClassPath(J9VMThread * vmThread, J9ClassPathEntry * classPath, UDATA classPathCount, U_8 * className, UDATA classNameLength, UDATA flags, BOOLEAN verbose, J9TranslationLocalBuffer *localBuffer);
+static IDATA searchClassInClassPath(J9VMThread * vmThread, J9ClassPathEntry * classPath, UDATA classPathCount, U_8 * className, UDATA classNameLength, BOOLEAN verbose, J9TranslationLocalBuffer *localBuffer);
 static IDATA searchClassInPatchPaths(J9VMThread * vmThread, J9ClassPathEntry * patchPaths, UDATA patchPathCount, U_8 * className, UDATA classNameLength, BOOLEAN verbose, J9TranslationLocalBuffer *localBuffer);
 static IDATA searchClassInCPEntry(J9VMThread * vmThread, J9ClassPathEntry * cpEntry, J9Module * j9module, U_8 * moduleName, U_8 * className, UDATA classNameLength, BOOLEAN verbose);
 static IDATA readFileFromJImage (J9VMThread * vmThread, J9Module * j9module, U_8 * moduleName, J9ClassPathEntry *cpEntry);
 
 IDATA 
-findLocallyDefinedClass(J9VMThread * vmThread, J9Module * j9module, U_8 * className, U_32 classNameLength, J9ClassLoader * classLoader, J9ClassPathEntry * classPath, UDATA classPathEntryCount, UDATA options, UDATA flags, J9TranslationLocalBuffer *localBuffer)
+findLocallyDefinedClass(J9VMThread * vmThread, J9Module * j9module, U_8 * className, U_32 classNameLength, J9ClassLoader * classLoader, J9ClassPathEntry * classPath, UDATA classPathEntryCount, UDATA options, J9TranslationLocalBuffer *localBuffer)
 {
 	IDATA result = 0;
 	J9JavaVM *javaVM = vmThread->javaVM;
@@ -169,7 +169,7 @@ findLocallyDefinedClass(J9VMThread * vmThread, J9Module * j9module, U_8 * classN
 	}
 
 	/* If the class is still not found, search it in classpath */
-	result = searchClassInClassPath(vmThread, classPath, classPathEntryCount, mbString, mbLength, flags, verbose, localBuffer);
+	result = searchClassInClassPath(vmThread, classPath, classPathEntryCount, mbString, mbLength, verbose, localBuffer);
 
 _end:
 	if (0 != result) {
@@ -243,14 +243,13 @@ searchClassInModule(J9VMThread * vmThread, J9Module * j9module, U_8 * className,
  * @param [in] classPathCount number of entries in classPath array
  * @param [in] className name of the class to be searched
  * @param [in] classNameLength length of the className
- * @param [in] flags flags to control which class path entries should be searched
  * @param [in] verbose if TRUE record the class loading stats
  * @param [in/out] localBuffer contains values for entryIndex, loadLocationType and cpEntryUsed. This pointer can't be NULL.
  *
  * @return 0 on success, 1 if the class is not found, -1 on error
  */
 static IDATA
-searchClassInClassPath(J9VMThread * vmThread, J9ClassPathEntry * classPath, UDATA classPathCount, U_8 * className, UDATA classNameLength, UDATA flags, BOOLEAN verbose, J9TranslationLocalBuffer *localBuffer)
+searchClassInClassPath(J9VMThread * vmThread, J9ClassPathEntry * classPath, UDATA classPathCount, U_8 * className, UDATA classNameLength, BOOLEAN verbose, J9TranslationLocalBuffer *localBuffer)
 {
 	J9JavaVM *javaVM = vmThread->javaVM;
 	J9InternalVMFunctions const * const vmFuncs = javaVM->internalVMFunctions;
@@ -263,19 +262,6 @@ searchClassInClassPath(J9VMThread * vmThread, J9ClassPathEntry * classPath, UDAT
 
 	for (i = 0; i < classPathCount; i++) {
 		cpEntry = &classPath[i];
-		/* 
-		 * should we consider this entry? This is important for J2ME VMs, where 
-		 * the classpath may contain a mix of BP and CP entries 
-		 */
-		if (flags & BCU_BOOTSTRAP_ENTRIES_ONLY) {
-			if (!(cpEntry->flags & CPE_FLAG_BOOTSTRAP)) {
-				continue;
-			}
-		} else if (flags & BCU_NON_BOOTSTRAP_ENTRIES_ONLY) {
-			if ( cpEntry->flags & CPE_FLAG_BOOTSTRAP) {
-				continue;
-			}
-		}
 
 		/* Warm up the entry */
 		vmFuncs->initializeClassPathEntry(javaVM, cpEntry);

runtime/jcl/common/jcldefine.c

@@ -145,6 +145,11 @@ defineClassCommon(JNIEnv *env, jobject classLoaderObject,
 	tempClassBytes = classBytes;
 	tempLength = length;
 
+	/* Try to find classLocation. Ignore return code because there are valid cases where it might not find it (ie. bytecode spinning).
+	 * If the class is not found the default class location is fine.
+	 */
+	dynFuncs->findLocallyDefinedClassFunction(currentThread, NULL, utf8Name, (U_32) utf8Length, classLoader, classLoader->classPathEntries, classLoader->classPathEntryCount, (UDATA) FALSE, &localBuffer);
+
 	/* skip if we are anonClass */
 	if (J9_ARE_NO_BITS_SET(options, J9_FINDCLASS_FLAG_ANON)) {
 		/* Check for romClass cookie, it indicates that we are  defining a class out of a JXE not from class bytes */
@@ -164,7 +169,7 @@ defineClassCommon(JNIEnv *env, jobject classLoaderObject,
 																			protectionDomain ? *(j9object_t*)protectionDomain : NULL,
 																			NULL,
 																			J9_CP_INDEX_NONE,
-																			LOAD_LOCATION_UNKNOWN,
+																			localBuffer.loadLocationType,
 																			NULL,
 																			hostClass);
 				/* Done if a class was found or and exception is pending, otherwise try to define the bytes */

runtime/jcl/common/vm_scar.c

@@ -364,7 +364,6 @@ J9VMDllMain(J9JavaVM* vm, IDATA stage, void* reserved)
 			vm->jclFlags |=
 				J9_JCL_FLAG_REFERENCE_OBJECTS | 
 				J9_JCL_FLAG_FINALIZATION | 
-				J9_JCL_FLAG_CLASSLOADERS | 
 				J9_JCL_FLAG_THREADGROUPS;
 			vm->jclSysPropBuffer = NULL;
 

runtime/oti/bcutil_api.h

@@ -256,7 +256,7 @@ internalLoadROMClass(J9VMThread *vmThread, J9LoadROMClassData *loadData, J9Trans
 * @return zero on success, -1 on failure.
 */
 IDATA 
-findLocallyDefinedClass(J9VMThread * vmThread, J9Module *j9module, U_8 * className, U_32 classNameLength, J9ClassLoader * classLoader, J9ClassPathEntry * classPath, UDATA classPathEntryCount, UDATA options, UDATA flags, J9TranslationLocalBuffer *localBuffer);
+findLocallyDefinedClass(J9VMThread * vmThread, J9Module *j9module, U_8 * className, U_32 classNameLength, J9ClassLoader * classLoader, J9ClassPathEntry * classPath, UDATA classPathEntryCount, UDATA options, J9TranslationLocalBuffer *localBuffer);
 
 
 #endif /* J9VM_OPT_DYNAMIC_LOAD_SUPPORT */ /* End File Level Build Flags */

runtime/oti/j9consts.h

@@ -607,7 +607,6 @@ extern "C" {
 
 #define J9_JCL_FLAG_REFERENCE_OBJECTS 0x1
 #define J9_JCL_FLAG_FINALIZATION 0x2
-#define J9_JCL_FLAG_CLASSLOADERS 0x4
 #define J9_JCL_FLAG_THREADGROUPS 0x8
 #define J9_JCL_FLAG_RESOURCE_MANAGED 0x10
 #define J9_JCL_FLAG_COM_SUN_MANAGEMENT_PROP 0x20

runtime/oti/j9nonbuilder.h

@@ -1800,7 +1800,7 @@ typedef struct J9TranslationBufferSet {
 	U_8* classFileError;
 	UDATA classFileSize;
 	void* romClassBuilder;
-	IDATA  ( *findLocallyDefinedClassFunction)(struct J9VMThread * vmThread, struct J9Module * j9module, U_8 * className, U_32 classNameLength, struct J9ClassLoader * classLoader, struct J9ClassPathEntry * classPath, UDATA classPathEntryCount, UDATA options, UDATA flags, struct J9TranslationLocalBuffer *localBuffer) ;
+	IDATA  ( *findLocallyDefinedClassFunction)(struct J9VMThread * vmThread, struct J9Module * j9module, U_8 * className, U_32 classNameLength, struct J9ClassLoader * classLoader, struct J9ClassPathEntry * classPath, UDATA classPathEntryCount, UDATA options, struct J9TranslationLocalBuffer *localBuffer) ;
 	struct J9Class*  ( *internalDefineClassFunction)(struct J9VMThread* vmThread, void* className, UDATA classNameLength, U_8* classData, UDATA classDataLength, j9object_t classDataObject, struct J9ClassLoader* classLoader, j9object_t protectionDomain, UDATA options, struct J9ROMClass *existingROMClass, struct J9Class *hostClass, struct J9TranslationLocalBuffer *localBuffer) ;
 	I_32  ( *closeZipFileFunction)(struct J9VMInterface* vmi, struct VMIZipFile* zipFile) ;
 	void  ( *reportStatisticsFunction)(struct J9JavaVM * javaVM, struct J9ClassLoader* loader, struct J9ROMClass* romClass, struct J9TranslationLocalBuffer *localBuffer) ;
@@ -1809,8 +1809,6 @@ typedef struct J9TranslationBufferSet {
 } J9TranslationBufferSet;
 
 #define BCU_UNUSED_2  2
-#define BCU_BOOTSTRAP_ENTRIES_ONLY  16
-#define BCU_NON_BOOTSTRAP_ENTRIES_ONLY  32
 #define BCU_VERBOSE  1
 #define BCU_TRACK_UTF8DATA  4
 #define BCU_UNUSED_40  64

runtime/oti/j9vm.hdf

@@ -1121,7 +1121,6 @@ typedef UDATA (* lookupNativeAddressCallback)(struct J9VMThread *currentThread,
 		<data type="const char*" name="className" description="name of class to find" />
 		<data type="UDATA" name="classNameLength" description="length of the className param" />
 		<data type="struct J9ClassLoader*" name="classloader" description="caller classloader" />
-		<data type="UDATA" name="flags" description="flags that control how class is loaded" />
 		<data type="IDATA*" name="classFound" description="returns non zero if class was found" />
 		<data type="IDATA*" return="true" name="result" description="returns non zero if the hook ran" />
 	</event>

runtime/vm/KeyHashTable.c

@@ -467,7 +467,7 @@ hashPkgTableIDFor(J9VMThread *vmThread, J9ClassLoader *classLoader, J9ROMClass*
 
 	key.tag = (UDATA)romClass | TAG_ROM_CLASS;
 
-	if (isSystemClassLoader && (LOAD_LOCATION_UNKNOWN == locationType)) {
+	if (isSystemClassLoader && (J9ROMCLASS_IS_UNSAFE(romClass) || (LOAD_LOCATION_UNKNOWN == locationType))) {
 		key.tag |= TAG_GENERATED_PACKAGE;
 	}
 

runtime/vm/classsupport.c

@@ -490,7 +490,6 @@ resolveKnownClass(J9JavaVM * vm, UDATA index)
  * @param classNameLength Length of the class name
  * @param classLoader Class loader object
  * @param options
- * @param flags contains 0 or BOOTSTRAP_ENTRIES_ONLY
  * @param [in/out] localBuffer contains values for entryIndex, loadLocationType and cpEntryUsed. This pointer can't be NULL.
  * @return pointer to class if locally defined, 0 if not defined, -1 if we cannot do dynamic load
  *
@@ -500,7 +499,7 @@ resolveKnownClass(J9JavaVM * vm, UDATA index)
  */
 
 static IDATA
-callFindLocallyDefinedClass(J9VMThread* vmThread, J9Module *j9module, U_8* className, UDATA classNameLength, J9ClassLoader* classLoader, UDATA options, UDATA flags, J9TranslationLocalBuffer *localBuffer) {
+callFindLocallyDefinedClass(J9VMThread* vmThread, J9Module *j9module, U_8* className, UDATA classNameLength, J9ClassLoader* classLoader, UDATA options, J9TranslationLocalBuffer *localBuffer) {
 	IDATA findResult = -1;
 	J9TranslationBufferSet *dynamicLoadBuffers = vmThread->javaVM->dynamicLoadBuffers;
 	J9ROMClass* returnVal = NULL;
@@ -530,15 +529,15 @@ callFindLocallyDefinedClass(J9VMThread* vmThread, J9Module *j9module, U_8* class
 																		 vmThread, 
 																		 (const char *)className, 
 																		 classNameLength,
-																		 classLoader, 
-																		 flags,
+																		 classLoader,
 																		 &classFound,
 																		 returnPointer);
-			if (returnVal != NULL){
+
+			if (returnVal != NULL) {
 				findResult = classFound;
 			} else {
 				findResult = dynamicLoadBuffers->findLocallyDefinedClassFunction(vmThread, j9module, className, (U_32)classNameLength, classLoader, classPathEntries,
-						classLoader->classPathEntryCount, options, flags, localBuffer);
+						classLoader->classPathEntryCount, options, localBuffer);
 				if ((-1 == findResult) && (J9_PRIVATE_FLAGS_REPORT_ERROR_LOADING_CLASS & vmThread->privateFlags)) {
 					vmThread->privateFlags |= J9_PRIVATE_FLAGS_FAILED_LOADING_REQUIRED_CLASS;
 				}
@@ -589,14 +588,8 @@ attemptDynamicClassLoad(J9VMThread* vmThread, J9Module *j9module, U_8* className
 		IDATA findResult = -1;
 		J9TranslationLocalBuffer localBuffer = {J9_CP_INDEX_NONE, LOAD_LOCATION_UNKNOWN, NULL};
 
-		if (J9_JCL_FLAG_CLASSLOADERS & vmThread->javaVM->jclFlags) {
-			findResult = callFindLocallyDefinedClass(vmThread, j9module, className, classNameLength, classLoader, options, 0, &localBuffer);
-		} else {
-			findResult = callFindLocallyDefinedClass(vmThread, j9module, className, classNameLength, classLoader, options, BCU_BOOTSTRAP_ENTRIES_ONLY, &localBuffer);
-			if (-1 == findResult) {
-				findResult = callFindLocallyDefinedClass(vmThread, j9module, className, classNameLength, classLoader, options, BCU_NON_BOOTSTRAP_ENTRIES_ONLY, &localBuffer);
-			}
-		}
+		findResult = callFindLocallyDefinedClass(vmThread, j9module, className, classNameLength, classLoader, options, &localBuffer);
+
 		if (-1 != findResult) {
 			J9TranslationBufferSet *dynamicLoadBuffers = vmThread->javaVM->dynamicLoadBuffers;
 

runtime/vm/createramclass.cpp

@@ -2575,9 +2575,9 @@ internalCreateRAMClassFromROMClassImpl(J9VMThread *vmThread, J9ClassLoader *clas
 			}
 			if (classLoader == javaVM->systemClassLoader) {
 				/* We don't add class location entries with locationType, LOAD_LOCATION_UNKNOWN, in the classLocationHashTable.
-				 * This should save footprint.
+				 * This should save footprint. Same applies for classes created with Unsafe.defineclass or Unsafe.defineAnonClass.
 				 */
-				if ((NULL == classBeingRedefined) && (LOAD_LOCATION_UNKNOWN != locationType)) {
+				if ((NULL == classBeingRedefined) && (LOAD_LOCATION_UNKNOWN != locationType) && (!J9ROMCLASS_IS_UNSAFE(romClass))) {
 					J9ClassLocation classLocation;
 
 					classLocation.clazz = ramClass;