Skip to content

[GR-47411] Make unique stub names stable. #7084

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
Jul 31, 2023
Merged

[GR-47411] Make unique stub names stable. #7084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,22 @@ public static String uniqueShortName(Member m) {
* @return a unique stub name for the method
*/
public static String uniqueStubName(ResolvedJavaMethod m) {
String shortName = UniqueShortNameProvider.singleton().uniqueShortName(null, m.getDeclaringClass(), m.getName(), m.getSignature(), m.isConstructor());
return stripPackage(m.getDeclaringClass().toJavaName()) + "_" +
(m.isConstructor() ? "constructor" : m.getName()) + "_" +
SubstrateUtil.digest(shortName);
return uniqueShortName("", m.getDeclaringClass(), m.getName(), m.getSignature(), m.isConstructor());
}

public static String uniqueShortName(String loaderNameAndId, ResolvedJavaType declaringClass, String methodName, Signature methodSignature, boolean isConstructor) {
StringBuilder sb = new StringBuilder(loaderNameAndId);
sb.append(declaringClass.toClassName()).append(".").append(methodName).append("(");
for (int i = 0; i < methodSignature.getParameterCount(false); i++) {
sb.append(methodSignature.getParameterType(i, null).toClassName()).append(",");
}
sb.append(')');
if (!isConstructor) {
sb.append(methodSignature.getReturnType(null).toClassName());
}

return stripPackage(declaringClass.toJavaName()) + "_" +
(isConstructor ? "constructor" : methodName) + "_" + digest(sb.toString());
}

/**
Expand Down
15 changes: 1 addition & 14 deletions ...m/src/com.oracle.svm.core/src/com/oracle/svm/core/UniqueShortNameProviderDefaultImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,7 @@
public class UniqueShortNameProviderDefaultImpl implements UniqueShortNameProvider {
@Override
public String uniqueShortName(ClassLoader loader, ResolvedJavaType declaringClass, String methodName, Signature methodSignature, boolean isConstructor) {
String loaderName = SubstrateUtil.classLoaderNameAndId(loader);
StringBuilder sb = new StringBuilder(loaderName);
sb.append(declaringClass.toClassName()).append(".").append(methodName).append("(");
for (int i = 0; i < methodSignature.getParameterCount(false); i++) {
sb.append(methodSignature.getParameterType(i, null).toClassName()).append(",");
}
sb.append(')');
if (!isConstructor) {
sb.append(methodSignature.getReturnType(null).toClassName());
}

return SubstrateUtil.stripPackage(declaringClass.toJavaName()) + "_" +
(isConstructor ? "constructor" : methodName) + "_" +
SubstrateUtil.digest(sb.toString());
return SubstrateUtil.uniqueShortName(SubstrateUtil.classLoaderNameAndId(loader), declaringClass, methodName, methodSignature, isConstructor);
}

@Override
Expand Down