Skip to content

[GR-70018] Record virtual call targets in FactoryMethods #12302

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
Oct 7, 2025
Merged

[GR-70018] Record virtual call targets in FactoryMethods #12302

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
12 changes: 11 additions & 1 deletion ...m.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/LayeredDispatchTableFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import com.oracle.svm.core.util.VMError;
import com.oracle.svm.hosted.FeatureImpl;
import com.oracle.svm.hosted.FeatureImpl.BeforeCompilationAccessImpl;
import com.oracle.svm.hosted.code.FactoryMethod;
import com.oracle.svm.hosted.image.NativeImage;
import com.oracle.svm.hosted.image.NativeImageCodeCache;
import com.oracle.svm.hosted.meta.HostedMetaAccess;
Expand Down Expand Up @@ -264,11 +265,20 @@ void installBuilderModules(Set<Module> newCoreTypes) {
public void recordVirtualCallTarget(HostedMethod caller, HostedMethod callee) {
Module callerModule = caller.getDeclaringClass().getJavaClass().getModule();
Module calleeModule = callee.getDeclaringClass().getJavaClass().getModule();
if (!(builderModules.contains(callerModule) || builderModules.contains(calleeModule))) {
if (!(builderModules.contains(callerModule) && !isFactoryMethod(caller)) && !builderModules.contains(calleeModule)) {
virtualCallTargets.add(callee);
}
}

/**
* {@link FactoryMethod FactoryMethods} outline the allocation and call to the original
* constructor. Hence, whether the call is included or not should be based exclusively on the
* callee.
*/
private static boolean isFactoryMethod(HostedMethod caller) {
return caller.getWrapped().getWrapped() instanceof FactoryMethod;
}

public void registerDeclaredDispatchInfo(HostedType type, List<HostedMethod> declaredMethods) {
var dispatchTable = new HostedDispatchTable();
dispatchTable.type = type;
Expand Down