Change exception being caught to NPE and fix compilation errors

Author: fjeremic

jcl/src/java.base/share/classes/com/ibm/jit/JITHelpers.java

@@ -1184,9 +1184,9 @@ public static Object invoke(MethodAccessor ma, Object obj, Object[] args) throws
 		try {
 			return ma.invoke(obj, args);
 		} catch (InvocationTargetException e) {
-			if (e.getCause() != null && e.getCause().getClass().getName().equals("java.lang.AssertionError")) {
+			if (e.getCause() != null && e.getCause().getClass().getName().equals("java.lang.NullPointerException")) {
 				// TODO: Need synchronization to prevent many threads entering here
-				System.err.println("Caught org.opentest4j.AssertionFailedError inside JITHelpers");
+				System.err.println("Caught java.lang.NullPointerException inside JITHelpers");
 
 				debugAgentRun(ma, obj, args);
 

runtime/compiler/control/DebugAgent.cpp

@@ -221,9 +221,9 @@ debugAgentRevertToInterpreter(J9VMThread* vmThread, J9JITExceptionTable *jitMeth
 
     void *pc = compInfo->getPCIfCompiled(jitMethod->ramMethod);
     fprintf(stderr, "Invalidating PC = %p %.*s.%.*s%.*s\n", pc,
-        (UDATA)J9UTF8_LENGTH(className), J9UTF8_DATA(className),
-        (UDATA)J9UTF8_LENGTH(methName), J9UTF8_DATA(methName),
-        (UDATA)J9UTF8_LENGTH(methSig), J9UTF8_DATA(methSig));
+        (int)J9UTF8_LENGTH(className), J9UTF8_DATA(className),
+        (int)J9UTF8_LENGTH(methName), J9UTF8_DATA(methName),
+        (int)J9UTF8_LENGTH(methSig), J9UTF8_DATA(methSig));
 
     TR::Recompilation::methodCannotBeRecompiled(pc, frontendOfThread);
 
@@ -269,10 +269,10 @@ debugAgentRecompile(J9VMThread* vmThread, J9JITExceptionTable *jitMethod, IDATA
     J9UTF8 *className = J9ROMCLASS_CLASSNAME(clazz->romClass);
 
     void *pc = compInfo->getPCIfCompiled(jitMethod->ramMethod);
-    fprintf(stderr, "Recompiling PC = %p lastOptIndex = %d lastOptSubIndex = %d %.*s.%.*s%.*s\n", pc, lastOptIndex, lastOptSubIndex, 
-        (UDATA)J9UTF8_LENGTH(className), J9UTF8_DATA(className),
-        (UDATA)J9UTF8_LENGTH(methName), J9UTF8_DATA(methName),
-        (UDATA)J9UTF8_LENGTH(methSig), J9UTF8_DATA(methSig));
+    fprintf(stderr, "Recompiling PC = %p lastOptIndex = %d lastOptSubIndex = %d %.*s.%.*s%.*s\n", pc, (int)lastOptIndex, (int)lastOptSubIndex, 
+        (int)J9UTF8_LENGTH(className), J9UTF8_DATA(className),
+        (int)J9UTF8_LENGTH(methName), J9UTF8_DATA(methName),
+        (int)J9UTF8_LENGTH(methSig), J9UTF8_DATA(methSig));
 
     // The request to use a trace log gets passed to the compilation via the optimization plan. The options object
     // created before the compile is issued will use the trace log we provide to initialize IL tracing.