60
60
import com .oracle .svm .core .heap .ReferenceHandler ;
61
61
import com .oracle .svm .core .option .APIOption ;
62
62
import com .oracle .svm .core .option .APIOptionGroup ;
63
+ import com .oracle .svm .core .option .BundleMember ;
63
64
import com .oracle .svm .core .option .HostedOptionKey ;
64
65
import com .oracle .svm .core .option .HostedOptionValues ;
65
66
import com .oracle .svm .core .option .LocatableMultiOptionValue ;
@@ -81,7 +82,7 @@ public class SubstrateOptions {
81
82
@ Option (help = "Preserve the local variable information for every Java source line to allow line-by-line stepping in the debugger. Allow the lookup of Java-level method information, e.g., in stack traces." )//
82
83
public static final HostedOptionKey <Boolean > SourceLevelDebug = new HostedOptionKey <>(false );
83
84
@ Option (help = "Constrain debug info generation to the comma-separated list of package prefixes given to this option." )//
84
- public static final HostedOptionKey <LocatableMultiOptionValue .Strings > SourceLevelDebugFilter = new HostedOptionKey <>(LocatableMultiOptionValue .Strings .commaSeparated ());
85
+ public static final HostedOptionKey <LocatableMultiOptionValue .Strings > SourceLevelDebugFilter = new HostedOptionKey <>(LocatableMultiOptionValue .Strings .buildWithCommaDelimiter ());
85
86
86
87
public static boolean parseOnce () {
87
88
/*
@@ -271,10 +272,11 @@ public static void setDebugInfoValueUpdateHandler(ValueUpdateHandler<Integer> up
271
272
public static final HostedOptionKey <Boolean > IncludeNodeSourcePositions = new HostedOptionKey <>(false );
272
273
273
274
@ Option (help = "Search path for C libraries passed to the linker (list of comma-separated directories)" )//
274
- public static final HostedOptionKey <LocatableMultiOptionValue .Paths > CLibraryPath = new HostedOptionKey <>(LocatableMultiOptionValue .Paths .commaSeparated ());
275
+ @ BundleMember (role = BundleMember .Role .Input )//
276
+ public static final HostedOptionKey <LocatableMultiOptionValue .Paths > CLibraryPath = new HostedOptionKey <>(LocatableMultiOptionValue .Paths .buildWithCommaDelimiter ());
275
277
276
278
@ Option (help = "Path passed to the linker as the -rpath (list of comma-separated directories)" )//
277
- public static final HostedOptionKey <LocatableMultiOptionValue .Strings > LinkerRPath = new HostedOptionKey <>(LocatableMultiOptionValue .Strings .commaSeparated ());
279
+ public static final HostedOptionKey <LocatableMultiOptionValue .Strings > LinkerRPath = new HostedOptionKey <>(LocatableMultiOptionValue .Strings .buildWithCommaDelimiter ());
278
280
279
281
@ Option (help = "Directory of the image file to be generated" , type = OptionType .User )//
280
282
public static final HostedOptionKey <String > Path = new HostedOptionKey <>(null );
@@ -364,11 +366,11 @@ public Boolean getValue(OptionValues values) {
364
366
365
367
@ APIOption (name = "trace-class-initialization" )//
366
368
@ Option (help = "Comma-separated list of fully-qualified class names that class initialization is traced for." )//
367
- public static final HostedOptionKey <LocatableMultiOptionValue .Strings > TraceClassInitialization = new HostedOptionKey <>(LocatableMultiOptionValue .Strings .commaSeparated ());
369
+ public static final HostedOptionKey <LocatableMultiOptionValue .Strings > TraceClassInitialization = new HostedOptionKey <>(LocatableMultiOptionValue .Strings .buildWithCommaDelimiter ());
368
370
369
371
@ APIOption (name = "trace-object-instantiation" )//
370
372
@ Option (help = "Comma-separated list of fully-qualified class names that object instantiation is traced for." )//
371
- public static final HostedOptionKey <LocatableMultiOptionValue .Strings > TraceObjectInstantiation = new HostedOptionKey <>(LocatableMultiOptionValue .Strings .commaSeparated ());
373
+ public static final HostedOptionKey <LocatableMultiOptionValue .Strings > TraceObjectInstantiation = new HostedOptionKey <>(LocatableMultiOptionValue .Strings .buildWithCommaDelimiter ());
372
374
373
375
@ Option (help = "Trace all native tool invocations as part of image building" , type = User )//
374
376
public static final HostedOptionKey <Boolean > TraceNativeToolUsage = new HostedOptionKey <>(false );
@@ -383,10 +385,10 @@ public Boolean getValue(OptionValues values) {
383
385
@ APIOption (name = "enable-https" , fixedValue = "https" , customHelp = "enable https support in the generated image" )//
384
386
@ APIOption (name = "enable-url-protocols" )//
385
387
@ Option (help = "List of comma separated URL protocols to enable." )//
386
- public static final HostedOptionKey <LocatableMultiOptionValue .Strings > EnableURLProtocols = new HostedOptionKey <>(LocatableMultiOptionValue .Strings .commaSeparated ());
388
+ public static final HostedOptionKey <LocatableMultiOptionValue .Strings > EnableURLProtocols = new HostedOptionKey <>(LocatableMultiOptionValue .Strings .buildWithCommaDelimiter ());
387
389
388
390
@ Option (help = "List of comma separated URL protocols that must never be included." )//
389
- public static final HostedOptionKey <LocatableMultiOptionValue .Strings > DisableURLProtocols = new HostedOptionKey <>(LocatableMultiOptionValue .Strings .commaSeparated ());
391
+ public static final HostedOptionKey <LocatableMultiOptionValue .Strings > DisableURLProtocols = new HostedOptionKey <>(LocatableMultiOptionValue .Strings .buildWithCommaDelimiter ());
390
392
391
393
@ SuppressWarnings ("unused" ) //
392
394
@ APIOption (name = "enable-all-security-services" )//
@@ -503,7 +505,7 @@ public static long getTearDownFailureNanos() {
503
505
public static final HostedOptionKey <Boolean > AOTTrivialInline = new HostedOptionKey <>(true );
504
506
505
507
@ Option (help = "file:doc-files/NeverInlineHelp.txt" , type = OptionType .Debug )//
506
- public static final HostedOptionKey <LocatableMultiOptionValue .Strings > NeverInline = new HostedOptionKey <>(new LocatableMultiOptionValue .Strings ());
508
+ public static final HostedOptionKey <LocatableMultiOptionValue .Strings > NeverInline = new HostedOptionKey <>(LocatableMultiOptionValue .Strings . build ());
507
509
508
510
@ Option (help = "Maximum number of nodes in a method so that it is considered trivial." )//
509
511
public static final HostedOptionKey <Integer > MaxNodesInTrivialMethod = new HostedOptionKey <>(20 );
@@ -524,7 +526,7 @@ public static long getTearDownFailureNanos() {
524
526
public static final HostedOptionKey <Boolean > UseCompressedFrameEncodings = new HostedOptionKey <>(true );
525
527
526
528
@ Option (help = "Report error if <typename>[:<UsageKind>{,<UsageKind>}] is discovered during analysis (valid values for UsageKind: InHeap, Allocated, Reachable)." , type = OptionType .Debug )//
527
- public static final HostedOptionKey <LocatableMultiOptionValue .Strings > ReportAnalysisForbiddenType = new HostedOptionKey <>(new LocatableMultiOptionValue .Strings ());
529
+ public static final HostedOptionKey <LocatableMultiOptionValue .Strings > ReportAnalysisForbiddenType = new HostedOptionKey <>(LocatableMultiOptionValue .Strings . build ());
528
530
529
531
@ Option (help = "Backend used by the compiler" , type = OptionType .User )//
530
532
public static final HostedOptionKey <String > CompilerBackend = new HostedOptionKey <>("lir" ) {
@@ -591,7 +593,7 @@ public static boolean useLIRBackend() {
591
593
public static final HostedOptionKey <String > CCompilerPath = new HostedOptionKey <>(null );
592
594
@ APIOption (name = "native-compiler-options" )//
593
595
@ Option (help = "Provide custom C compiler option used for query code compilation." , type = OptionType .User )//
594
- public static final HostedOptionKey <LocatableMultiOptionValue .Strings > CCompilerOption = new HostedOptionKey <>(new LocatableMultiOptionValue .Strings ());
596
+ public static final HostedOptionKey <LocatableMultiOptionValue .Strings > CCompilerOption = new HostedOptionKey <>(LocatableMultiOptionValue .Strings . build ());
595
597
596
598
@ Option (help = "Use strict checks when performing query code compilation." , type = OptionType .User )//
597
599
public static final HostedOptionKey <Boolean > StrictQueryCodeCompilation = new HostedOptionKey <>(true );
@@ -653,7 +655,7 @@ public static void defaultDebugInfoValueUpdateHandler(EconomicMap<OptionKey<?>,
653
655
}
654
656
655
657
@ Option (help = "Search path for source files for Application or GraalVM classes (list of comma-separated directories or jar files)" )//
656
- public static final HostedOptionKey <LocatableMultiOptionValue .Strings > DebugInfoSourceSearchPath = new HostedOptionKey <>(LocatableMultiOptionValue .Strings . commaSeparated ());
658
+ public static final HostedOptionKey <LocatableMultiOptionValue .Paths > DebugInfoSourceSearchPath = new HostedOptionKey <>(LocatableMultiOptionValue .Paths . buildWithCommaDelimiter ());
657
659
658
660
@ Option (help = "Directory under which to create source file cache for Application or GraalVM classes" )//
659
661
public static final HostedOptionKey <String > DebugInfoSourceCacheRoot = new HostedOptionKey <>("sources" );
0 commit comments