Skip to content

[GR-69513] [GR-69514] [GR-69620] Fix proxy serialization errors at build time. #12153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 18, 2025
Merged

[GR-69513] [GR-69514] [GR-69620] Fix proxy serialization errors at build time. #12153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c30b176
Fix proxy serialization errors
vjovanov Sep 8, 2025
8bffd99
Fix registerProxy to return null for wrong interfaces
vjovanov Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...vm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
import com.oracle.svm.core.util.ImageHeapMap;
import com.oracle.svm.core.util.VMError;
import com.oracle.svm.util.ClassUtil;
import com.oracle.svm.util.LogUtils;
import com.oracle.svm.util.ReflectionUtil;

import jdk.graal.compiler.debug.GraalError;
Expand Down Expand Up @@ -156,7 +155,6 @@ private static Object createProxyClass(Class<?>[] interfaces) {
}
return clazz;
} catch (Throwable t) {
LogUtils.warning("Could not create a proxy class from list of interfaces: %s. Reason: %s", Arrays.toString(interfaces), t.getMessage());
return t;
}
}
Expand Down
9 changes: 7 additions & 2 deletions ...tevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/proxy/ProxyRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
import java.util.function.BiConsumer;

import org.graalvm.nativeimage.impl.ConfigurationCondition;
import org.graalvm.nativeimage.impl.RuntimeProxyRegistrySupport;

import com.oracle.svm.core.jdk.proxy.DynamicProxyRegistry;
import com.oracle.svm.hosted.ConditionalConfigurationRegistry;
import com.oracle.svm.hosted.ImageClassLoader;
import com.oracle.svm.util.LogUtils;
import org.graalvm.nativeimage.impl.RuntimeProxyRegistrySupport;

public class ProxyRegistry extends ConditionalConfigurationRegistry implements RuntimeProxyRegistrySupport, BiConsumer<ConfigurationCondition, List<String>> {
private final DynamicProxyRegistry dynamicProxySupport;
Expand All @@ -57,7 +57,12 @@ public Class<?> registerProxy(ConfigurationCondition condition, Class<?>... inte
abortIfSealed();
requireNonNull(interfaces, "interface", "proxy class creation");
registerConditionalConfiguration(condition, (cnd) -> dynamicProxySupport.addProxyClass(cnd, interfaces));
return dynamicProxySupport.getProxyClassHosted(interfaces);
try {
return dynamicProxySupport.getProxyClassHosted(interfaces);
} catch (Throwable t) {
/* we return null for illegal proxy classes */
return null;
}
}

public Class<?> createProxyClassForSerialization(List<String> proxies) {
Expand Down
8 changes: 6 additions & 2 deletions ...m.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,12 @@ public void registerLambdaCapturingClass(ConfigurationCondition condition, Strin
public void registerProxyClass(ConfigurationCondition condition, List<String> implementedInterfaces) {
abortIfSealed();
registerConditionalConfiguration(condition, (cnd) -> {
Class<?> proxyClass = proxyRegistry.createProxyClassForSerialization(implementedInterfaces);
register(cnd, proxyClass);
try {
Class<?> proxyClass = proxyRegistry.createProxyClassForSerialization(implementedInterfaces);
register(cnd, proxyClass);
} catch (IllegalArgumentException t) {
/* ignore: can't serialize class that can't be instantiated */
}
});
}

Expand Down