Skip to content

[GR-66194] Ignore serialization constructors for reflection #11509

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

[GR-66194] Ignore serialization constructors for reflection #11509

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions ...oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionSubstitutionSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
*/
package com.oracle.svm.core.reflect.target;

import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
import java.lang.reflect.Field;

Expand Down Expand Up @@ -52,4 +53,6 @@ static ReflectionSubstitutionSupport singleton() {
* deleted.
*/
String getDeletionReason(Field field);

boolean isCustomSerializationConstructor(Constructor<?> reflectConstructor);
}
11 changes: 11 additions & 0 deletions ...vm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import static com.oracle.svm.core.configure.ConfigurationFiles.Options.TreatAllTypeReachableConditionsAsTypeReached;

import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
import java.lang.reflect.Field;
import java.lang.reflect.GenericArrayType;
Expand Down Expand Up @@ -87,6 +88,7 @@
import com.oracle.svm.core.hub.ClassForNameSupport;
import com.oracle.svm.core.hub.DynamicHub;
import com.oracle.svm.core.reflect.SubstrateAccessor;
import com.oracle.svm.core.reflect.target.ReflectionSubstitutionSupport;
import com.oracle.svm.core.util.VMError;
import com.oracle.svm.hosted.ClassLoaderFeature;
import com.oracle.svm.hosted.ConditionalConfigurationRegistry;
Expand Down Expand Up @@ -1243,6 +1245,15 @@ public void registerHeapReflectionField(Field reflectField, ScanReason reason) {

@Override
public void registerHeapReflectionExecutable(Executable reflectExecutable, ScanReason reason) {
if (reflectExecutable instanceof Constructor<?> reflectConstructor && ReflectionSubstitutionSupport.singleton().isCustomSerializationConstructor(reflectConstructor)) {
/*
* Constructors created by Constructor.newWithAccessor are indistinguishable from an
* equivalent constructor with a "correct" accessor, and as such could hide this
* constructor from reflection queries. We therefore exclude such constructors from the
* internal reflection metadata.
*/
return;
}
AnalysisMethod analysisMethod = metaAccess.lookupJavaMethod(reflectExecutable);
if (heapMethods.put(analysisMethod, reflectExecutable) == null) {
if (sealed) {
Expand Down
11 changes: 11 additions & 0 deletions ...ratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@

import com.oracle.graal.pointsto.ObjectScanner;
import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess;
import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
import com.oracle.graal.pointsto.meta.AnalysisMethod;
import com.oracle.graal.pointsto.meta.AnalysisUniverse;
import com.oracle.svm.configure.ConfigurationFile;
Expand Down Expand Up @@ -270,6 +271,16 @@ private MethodPointer asMethodPointer(ResolvedJavaMethod method) {
return new MethodPointer(aMethod);
}

@Override
public boolean isCustomSerializationConstructor(Constructor<?> reflectConstructor) {
if (ReflectionUtil.readField(Constructor.class, "constructorAccessor", reflectConstructor) instanceof SubstrateConstructorAccessor accessor) {
AnalysisMetaAccess analysisMetaAccess = analysisAccess.getMetaAccess();
AnalysisMethod analysisConstructor = analysisMetaAccess.lookupJavaMethod(reflectConstructor);
return !accessor.getFactoryMethod().equals(FactoryMethodSupport.singleton().lookup(analysisMetaAccess, analysisConstructor, analysisConstructor.getDeclaringClass(), false));
}
return false;
}

@Override
public List<Class<? extends Feature>> getRequiredFeatures() {
return List.of(ClassForNameSupportFeature.class, DynamicProxyFeature.class);
Expand Down