Merge pull request #5129 from keithc-ca/access

Fix handling of defining accessor and proxy classes in Java 12
eclipse-openj9 · Mar 16, 2019 · a3d5585 · a3d5585
2 parents e93b8cd + 41007aa
commit a3d5585
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/runtime/jcl/common/clsldr.cpp b/runtime/jcl/common/clsldr.cpp
@@ -61,6 +61,15 @@ Java_java_lang_ClassLoader_defineClassImpl(JNIEnv *env, jobject receiver, jstrin
 	}
 #endif /* J9VM_OPT_DYNAMIC_LOAD_SUPPORT */
 
+	if (NULL == protectionDomain) {
+		/*
+		 * Only trusted code has access to JavaLangAccess.defineClass();
+		 * callers only provide a NULL protectionDomain when exemptions
+		 * are required.
+		 */
+		options |= J9_FINDCLASS_FLAG_UNSAFE;
+	}
+
 	jclass result = defineClassCommon(env, receiver, className, classRep, offset, length, protectionDomain, options, NULL);
 
 	if (J9_ARE_ANY_BITS_SET(options, J9_FINDCLASS_FLAG_NAME_IS_INVALID) && (NULL == result) && (NULL == currentThread->currentException)) {

diff --git a/test/functional/Java8andUp/playlist.xml b/test/functional/Java8andUp/playlist.xml
@@ -116,9 +116,10 @@
 	</test>
 
 	<test>
-		<testCaseName>jsr335_interfacePrivateMethod_mode100</testCaseName>
+		<testCaseName>jsr335_interfacePrivateMethod</testCaseName>
 		<variations>
 			<variation>Mode100</variation>
+			<variation>NoOptions</variation>
 		</variations>
 		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
 	-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)GeneralTest.jar$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \