[GR-42737] Native-image-agent generates non existent classes for Swing application.

substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java

@@ -210,6 +210,9 @@ private static boolean forName(JNIEnvironment jni, JNIObjectHandle thread, Break
         JNIObjectHandle callerClass = state.getDirectCallerClass();
         JNIObjectHandle name = getObjectArgument(thread, 0);
         String className = fromJniString(jni, name);
+        if (className == null) {
+            return false; /* No point in tracing this. */
+        }
 
         boolean classLoaderValid = true;
         WordPointer classLoaderPtr = StackValue.get(WordPointer.class);
@@ -234,11 +237,13 @@ private static boolean forName(JNIEnvironment jni, JNIObjectHandle thread, Break
              * recursion checks keep us from seeing events of interest during initialization.
              */
             int initialize = 0;
-            JNIObjectHandle loadedClass = Support.callStaticObjectMethodLIL(jni, bp.clazz, agent.handles().javaLangClassForName3, name, initialize, classLoaderPtr.read());
-            if (clearException(jni)) {
-                loadedClass = nullHandle();
-            }
-            result = loadedClass.notEqual(nullHandle());
+            Support.callStaticObjectMethodLIL(jni, bp.clazz, agent.handles().javaLangClassForName3, name, initialize, classLoaderPtr.read());
+            JNIObjectHandle exception = handleException(jni, true);
+            /*
+             * To throw the right exceptions at run time, we need to ensure that the image builder
+             * sees them, so we trace all calls except those that throw a ClassNotFoundException.
+             */
+            result = exception.equal(nullHandle()) || !jniFunctions().getIsInstanceOf().invoke(jni, exception, agent.handles().javaLangClassNotFoundException);
         }
 
         traceReflectBreakpoint(jni, bp.clazz, nullHandle(), callerClass, bp.specification.methodName, result, state.getFullStackTraceOrNull(), className);

substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/NativeImageAgentJNIHandleSet.java

@@ -38,6 +38,7 @@ public class NativeImageAgentJNIHandleSet extends JNIHandleSet {
 
     final JNIObjectHandle javaLangClass;
     final JNIMethodId javaLangClassForName3;
+    final JNIObjectHandle javaLangClassNotFoundException;
     final JNIMethodId javaLangClassGetName;
     final JNIMethodId javaLangClassGetInterfaces;
 
@@ -87,6 +88,7 @@ public class NativeImageAgentJNIHandleSet extends JNIHandleSet {
         super(env);
         javaLangClass = newClassGlobalRef(env, "java/lang/Class");
         javaLangClassForName3 = getMethodId(env, javaLangClass, "forName", "(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;", true);
+        javaLangClassNotFoundException = newClassGlobalRef(env, "java/lang/ClassNotFoundException");
         javaLangClassGetName = getMethodId(env, javaLangClass, "getName", "()Ljava/lang/String;", false);
         javaLangClassGetInterfaces = getMethodId(env, javaLangClass, "getInterfaces", "()[Ljava/lang/Class;", false);
 

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/ReflectionProcessor.java

@@ -58,7 +58,7 @@ class ReflectionProcessor extends AbstractProcessor {
     public void processEntry(EconomicMap<String, ?> entry, ConfigurationSet configurationSet) {
         boolean invalidResult = Boolean.FALSE.equals(entry.get("result"));
         ConfigurationCondition condition = ConfigurationCondition.alwaysTrue();
-        if (invalidResult && !reportReflectiveFailure(entry)) {
+        if (invalidResult) {
             return;
         }
 
@@ -311,15 +311,4 @@ private void addDynamicProxyUnchecked(List<?> checkedInterfaceList, List<?> unch
         interfaces.addAll(uncheckedInterfaces);
         proxyConfiguration.add(ConfigurationCondition.alwaysTrue(), interfaces);
     }
-
-    private static boolean reportReflectiveFailure(EconomicMap<String, ?> entry) {
-        String function = (String) entry.get("function");
-        switch (function) {
-            case "forName":
-                List<?> args = (List<?>) entry.get("args");
-                String name = singleElement(args);
-                return name != null;
-        }
-        return false;
-    }
 }