Skip to content

[GR-70623] Fix unique proxy name for unnamed package. #12498

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 1 commit into from
Nov 7, 2025
Merged

[GR-70623] Fix unique proxy name for unnamed package. #12498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions ...vm.hosted/src/com/oracle/svm/hosted/reflect/proxy/ProxyRenamingSubstitutionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class ProxyRenamingSubstitutionProcessor extends SubstitutionProcessor {
public static final String NULL_CLASS_LOADER_NAME = "native-image-null-class-loader";
public static final String NULL_MODULE_NAME = "native-image-null-module";
public static final String UNNAMED_MODULE_NAME = "native-image-unnamed";
private static final String STABLE_NAME_TEMPLATE = "/$Proxy.s";
private static final String STABLE_NAME_TEMPLATE = "$Proxy.s";

private final ConcurrentMap<ResolvedJavaType, ProxySubstitutionType> typeSubstitutions = new ConcurrentHashMap<>();
private final Set<String> uniqueTypeNames = new HashSet<>();
Expand Down Expand Up @@ -127,12 +127,17 @@ public String getUniqueProxyName(Class<?> clazz) {
}

private String findUniqueName(Class<?> clazz, int hashCode) {
CharSequence baseName = "L" + clazz.getPackageName().replace('.', '/') + STABLE_NAME_TEMPLATE + Integer.toHexString(hashCode);
String name = baseName + ";";
CharSequence baseName;
if (clazz.getPackageName().isEmpty()) {
baseName = STABLE_NAME_TEMPLATE + Integer.toHexString(hashCode);
} else {
baseName = clazz.getPackageName().replace('.', '/') + '/' + STABLE_NAME_TEMPLATE + Integer.toHexString(hashCode);
}
String name = "L" + baseName + ";";
synchronized (uniqueTypeNames) {
int suffix = 1;
while (uniqueTypeNames.contains(name)) {
name = baseName + "_" + suffix + ";";
name = "L" + baseName + "_" + suffix + ";";
suffix++;
}
uniqueTypeNames.add(name);
Expand Down