Skip to content

Commit 8d75f34

Browse files
committed
[GR-55159] Pass reachability-metadata.json files from driver.
PullRequest: graal/18284
2 parents 721de6d + a4443ed commit 8d75f34

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationFiles.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ public static final class Options {
121121
public static final HostedOptionKey<AccumulatingLocatableMultiOptionValue.Strings> JNIConfigurationResources = new HostedOptionKey<>(
122122
AccumulatingLocatableMultiOptionValue.Strings.buildWithCommaDelimiter());
123123

124+
@Option(help = "Resources describing reachability metadata needed for the program " +
125+
"https://github.com/oracle/graal/blob/master/docs/reference-manual/native-image/assets/reachability-metadata-schema-v1.0.0.json", type = OptionType.User)//
126+
public static final HostedOptionKey<AccumulatingLocatableMultiOptionValue.Strings> ReachabilityMetadataResources = new HostedOptionKey<>(
127+
AccumulatingLocatableMultiOptionValue.Strings.buildWithCommaDelimiter());
128+
124129
@Option(help = "Files describing stubs allowing foreign calls.", type = OptionType.User)//
125130
@BundleMember(role = BundleMember.Role.Input)//
126131
public static final HostedOptionKey<AccumulatingLocatableMultiOptionValue.Paths> ForeignConfigurationFiles = new HostedOptionKey<>(

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/metainf/MetaInfFileType.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
public enum MetaInfFileType {
3333
Properties(null, NativeImageMetaInfWalker.nativeImagePropertiesFilename),
34+
ReachabilityMetadata(ConfigurationFiles.Options.ReachabilityMetadataResources, ConfigurationFile.REACHABILITY_METADATA.getFileName()),
3435
JniConfiguration(ConfigurationFiles.Options.JNIConfigurationResources, ConfigurationFile.JNI.getFileName()),
3536
ForeignConfiguration(ConfigurationFiles.Options.ForeignResources, ConfigurationFile.FOREIGN.getFileName()),
3637
ReflectConfiguration(ConfigurationFiles.Options.ReflectionConfigurationResources, ConfigurationFile.REFLECTION.getFileName()),

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*/
2525
package com.oracle.svm.hosted.config;
2626

27+
import static com.oracle.svm.core.configure.ConfigurationFiles.Options.ReachabilityMetadataResources;
2728
import static com.oracle.svm.core.configure.ConfigurationFiles.Options.TreatAllNameEntriesAsType;
2829

2930
import java.io.IOException;
@@ -86,7 +87,8 @@ public static int parseAndRegisterConfigurations(ConfigurationParser parser, Ima
8687
}
8788

8889
public static int parseAndRegisterConfigurationsFromCombinedFile(ConfigurationParser parser, ImageClassLoader classLoader, String featureName) {
89-
return parseAndRegisterConfigurations(parser, classLoader, featureName, ConfigurationFile.REACHABILITY_METADATA.getFileName(), Collections.emptyList(), Collections.emptyList());
90+
return parseAndRegisterConfigurations(parser, classLoader, featureName, ConfigurationFile.REACHABILITY_METADATA.getFileName(), Collections.emptyList(),
91+
ReachabilityMetadataResources.getValue().values());
9092
}
9193

9294
public static int parseAndRegisterConfigurations(ConfigurationParser parser, ImageClassLoader classLoader,

0 commit comments

Comments
 (0)