Merge pull request #19 from babsingh/jcl_tnpe_to_ncdfe

Translate TypeNotPresentException to NoClassDefFoundError
eclipse-openj9 · Sep 25, 2017 · a0c8d18 · a0c8d18
2 parents 3551fdb + 70a939e
commit a0c8d18
Showing 1 changed file with 31 additions and 2 deletions.
diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
@@ -823,7 +823,11 @@ private static final MethodHandle resolveInvokeDynamic(Class<?> clazz, String na
 		MethodType type = null;
 
 		try {
-			type = MethodType.fromMethodDescriptorString(methodDescriptor, VM.getVMLangAccess().getClassloader(clazz));
+			try { 
+				type = MethodType.fromMethodDescriptorString(methodDescriptor, VM.getVMLangAccess().getClassloader(clazz));
+			} catch (TypeNotPresentException e) {
+				throw throwNoClassDefFoundError(e);
+			}
 			int bsmIndex = unsafe.getShort(bsmData);
 			int bsmArgCount = unsafe.getShort(bsmData + BSM_ARGUMENT_COUNT_OFFSET);
 			long bsmArgs = bsmData + BSM_ARGUMENTS_OFFSET;
@@ -892,7 +896,11 @@ private static final MethodHandle resolveInvokeDynamic(Class<?> clazz, String na
 					cpEntry = cp.getDoubleAt(index);
 					break;
 				case 13:
-					cpEntry = getCPMethodTypeAt(clazz, index);
+					try {
+						cpEntry = getCPMethodTypeAt(clazz, index);
+					} catch (TypeNotPresentException e) {
+						throw throwNoClassDefFoundError(e);
+					}
 					break;
 				case 14:
 					cpEntry = getCPMethodHandleAt(clazz, index);
@@ -963,6 +971,27 @@ private static final MethodHandle resolveInvokeDynamic(Class<?> clazz, String na
 		return result;
 	}
 
+	/**
+	 * Helper method to throw NoClassDefFoundError if the cause of TypeNotPresentException 
+	 * is ClassNotFoundException. Otherwise, re-throw TypeNotPresentException.
+	 * 
+	 * @param   an instance of TypeNotPresentException
+	 * 
+	 * @return  Throwable to prevent any fall through case
+	 * 
+	 * @throws  NoClassDefFoundError if the cause of TypeNotPresentException is 
+	 *          ClassNotFoundException. Otherwise, re-throw TypeNotPresentException.
+	 */
+	private static Throwable throwNoClassDefFoundError(TypeNotPresentException e) {
+		Throwable cause = e.getCause();
+		if (cause instanceof ClassNotFoundException) {
+			NoClassDefFoundError noClassDefFoundError = new NoClassDefFoundError(cause.getMessage());
+			noClassDefFoundError.initCause(cause);
+			throw noClassDefFoundError;
+		}
+		throw e;
+	}
+
 	@Override
 	public String toString() {
 		return "MethodHandle" + type.toString(); //$NON-NLS-1$