Skip to content

Commit cf889da

Browse files
committed
WIP
1 parent dff76ed commit cf889da

28 files changed

+919
-1542
lines changed

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeReflectionSupport.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,21 @@
4141
package org.graalvm.nativeimage.impl;
4242

4343
import java.lang.reflect.Executable;
44+
import java.lang.reflect.Field;
4445
import java.util.Set;
4546

4647
public interface RuntimeReflectionSupport extends ReflectionRegistry {
47-
// specific to java.lang.reflect reflection
48-
Set<Executable> getQueriedOnlyMethods();
48+
Set<Field> getReflectionFields();
49+
50+
Set<Executable> getReflectionExecutables();
51+
52+
Object getAccessor(Executable method);
4953

5054
/*
5155
* Returns the methods that shadow a superclass method registered for reflection, to be excluded
5256
* from reflection queries.
5357
*/
54-
Set<?> getHidingMethods();
58+
Set<?> getHidingReflectionMethods();
5559

5660
int getReflectionClassesCount();
5761

substratevm/mx.substratevm/suite.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,9 @@
193193
"sun.invoke.util",
194194
"sun.net",
195195
"sun.reflect.annotation",
196+
"sun.reflect.generics.factory",
196197
"sun.reflect.generics.reflectiveObjects",
198+
"sun.reflect.generics.repository",
197199
"sun.reflect.generics.tree",
198200
"sun.security.jca",
199201
"sun.security.ssl",

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -657,10 +657,6 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, String ol
657657
}
658658
};
659659

660-
@APIOption(name = "configure-reflection-metadata")//
661-
@Option(help = "Enable runtime instantiation of reflection objects for non-invoked methods.", type = OptionType.Expert)//
662-
public static final HostedOptionKey<Boolean> ConfigureReflectionMetadata = new HostedOptionKey<>(true);
663-
664660
@Option(help = "Include a list of methods included in the image for runtime inspection.", type = OptionType.Expert)//
665661
public static final HostedOptionKey<Boolean> IncludeMethodData = new HostedOptionKey<>(true);
666662

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void addToReferenceMapSize(long size) {
106106
}
107107

108108
public static final class Encoders {
109-
final FrequencyEncoder<JavaConstant> objectConstants;
109+
public final FrequencyEncoder<JavaConstant> objectConstants;
110110
public final FrequencyEncoder<Class<?>> sourceClasses;
111111
public final FrequencyEncoder<String> sourceMethodNames;
112112
final FrequencyEncoder<String> names;

0 commit comments

Comments
 (0)