Merge pull request #24385 from harship04/fix-arraycopy-nullrestricted-npe

Fix NullPointerException handling for null-restricted arrays in arraycopy

Author: hangshao0

runtime/vm/ValueTypeHelpers.hpp

@@ -594,6 +594,11 @@ class VM_ValueTypeHelpers {
 					srcObject = VM_VMHelpers::popObjectInSpecialFrame(currentThread);
 				}
 
+				/* Null cannot be stored into a null-restricted array. */
+				if ((NULL == copyObject) && J9_IS_J9ARRAYCLASS_NULL_RESTRICTED((J9ArrayClass *)destClazz)) {
+					return -2;
+				}
+
 				if (typeChecksRequired) {
 					if (!VM_VMHelpers::objectArrayStoreAllowed(currentThread, destObject, copyObject)) {
 						return -1;

test/functional/Valhalla/src_qtypes/org/openj9/test/lworld/ValueTypeSystemArraycopyTests.java

@@ -649,21 +649,21 @@ static public void testSystemArrayCopy22() throws Throwable {
 		try {
 			initArraysForASETest(); // ifArray3[ARRAY_SIZE/2] is NULL
 			testIFVT(ifArray3, nullRestrictedVtArrayDst);
-		} catch (java.lang.ArrayStoreException ase1) {
+		} catch (java.lang.ArrayStoreException | java.lang.NullPointerException ex1) {
 			try {
 				checkResultsPartial(ifArray3, nullRestrictedVtArrayDst, ARRAY_SIZE/2);
 				checkNullRestrictedVTArrayAfterException(ARRAY_SIZE/2);
 
 				initArraysForASETest();
 				testIFVT(ifArray3, nullRestrictedVtArrayDst);
-			} catch (java.lang.ArrayStoreException ase2) {
+			} catch (java.lang.ArrayStoreException | java.lang.NullPointerException ex2) {
 				checkResultsPartial(ifArray3, nullRestrictedVtArrayDst, ARRAY_SIZE/2);
 				// pass
 				return;
 			}
 		}
 
-		Assert.fail("Expect an ArrayStoreException. No exception or wrong kind of exception thrown");
+		Assert.fail("Expect an ArrayStoreException or NullPointerException. No exception or wrong kind of exception thrown");
 	}
 
 	@Test(priority=1)
@@ -672,22 +672,22 @@ static public void testSystemArrayCopy23() throws Throwable {
 		try {
 			initArraysForASETest(); // ifArray3[ARRAY_SIZE/2] is NULL
 			testIFIF(ifArray3, nullRestrictedVtArrayDst);
-		} catch (java.lang.ArrayStoreException ase1) {
+		} catch (java.lang.ArrayStoreException | java.lang.NullPointerException ex1) {
 			try {
 				checkResultsPartial(ifArray3, nullRestrictedVtArrayDst, ARRAY_SIZE/2);
 				checkNullRestrictedVTArrayAfterException(ARRAY_SIZE/2);
 
 				initArraysForASETest();
 				testIFIF(ifArray3, nullRestrictedVtArrayDst);
-			} catch (java.lang.ArrayStoreException ase2) {
+			} catch (java.lang.ArrayStoreException | java.lang.NullPointerException ex2) {
 				checkResultsPartial(ifArray3, nullRestrictedVtArrayDst, ARRAY_SIZE/2);
 				checkNullRestrictedVTArrayAfterException(ARRAY_SIZE/2);
 				// pass
 				return;
 			}
 		}
 
-		Assert.fail("Expect a ArrayStoreException. No exception or wrong kind of exception thrown");
+		Assert.fail("Expect an ArrayStoreException or NullPointerException. No exception or wrong kind of exception thrown");
 	}
 
 	@Test(priority=1)
@@ -776,7 +776,7 @@ static public void testSystemArrayCopy28() throws Throwable {
 		checkResults(nullRestrictedVtArraySrc, vtArrayDst);
 	}
 
-	@Test(priority=1, invocationCount=2, expectedExceptions=ArrayStoreException.class)
+	@Test(priority=1, invocationCount=2, expectedExceptions={ArrayStoreException.class, NullPointerException.class})
 	static public void testSystemArrayCopy29() throws Throwable {
 		initArraysToCopyNullToNullRestrictedArray();
 		testVTVT(vtArraySrc, nullRestrictedVtArrayDst);