Skip to content
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

[23.1] Backport: Use the API flag in the init hint. #7406 #572

Merged
merged 2 commits into from
Sep 18, 2023
+4 −2
Merged

[23.1] Backport: Use the API flag in the init hint. #7406 #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ced42e5
Use API flag in init hint
vjovanov Sep 13, 2023
611407d
Fail on missing API options
vjovanov Sep 13, 2023
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
4 changes: 3 additions & 1 deletion ...ratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,9 @@ public static String commandArgument(OptionKey<?> option, String value, String a
}
}
}
return HOSTED_OPTION_PREFIX + value + option;
String optionString = HOSTED_OPTION_PREFIX + value + option;
assert apiOptionName == null : "The API option " + apiOptionName + " not found for " + optionString;
return optionString;
} else {
String apiOptionWithValue = null;
for (APIOption apiOption : apiOptions) {
Expand Down
2 changes: 1 addition & 1 deletion substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporterFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void createAdditionalArtifacts(@SuppressWarnings("unused") BuildArtifacts
protected List<UserRecommendation> getRecommendations() {
return List.of(// in order of appearance:
new UserRecommendation("INIT",
"Adopt " + SubstrateOptionsParser.commandArgument(ClassInitializationOptions.StrictImageHeap, "+", "strict-initial-heap", true, false) +
"Adopt " + SubstrateOptionsParser.commandArgument(ClassInitializationOptions.StrictImageHeap, "+", "strict-image-heap", true, false) +
" to prepare for the next GraalVM release.",
() -> !ClassInitializationOptions.StrictImageHeap.getValue()),
new UserRecommendation("AWT", "Use the tracing agent to collect metadata for AWT.", ProgressReporterFeature::recommendTraceAgentForAWT),
Expand Down
Loading