Skip to content

[GR-37834] Use OptionOrigin values in translateOption error reporting. #4464

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 2 commits into from
Mar 30, 2022
Merged

[GR-37834] Use OptionOrigin values in translateOption error reporting. #4464

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
3d0a317
Use OptionOrigin values in translateOption error reporting
olpaw Mar 29, 2022
3cd151e
Handle @argument files in OptionOrigin#from
olpaw Mar 29, 2022
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: 4 additions & 0 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionOrigin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ public static OptionOrigin from(String origin) {
}
throw VMError.shouldNotReachHere("Unsupported OptionOrigin: " + origin);
}
if (originURI.getScheme() == null) {
/* @argument files use path as origin */
return commandLineOptionOriginSingleton;
}
switch (originURI.getScheme()) {
case "jar":
return new JarOptionOrigin(originURI);
Expand Down
3 changes: 2 additions & 1 deletion substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import com.oracle.svm.core.option.APIOption.APIOptionKind;
import com.oracle.svm.core.option.APIOptionGroup;
import com.oracle.svm.core.option.HostedOptionKey;
import com.oracle.svm.core.option.OptionOrigin;
import com.oracle.svm.core.option.SubstrateOptionsParser;
import com.oracle.svm.core.util.VMError;
import com.oracle.svm.driver.NativeImage.ArgumentQueue;
Expand Down Expand Up @@ -295,7 +296,7 @@ boolean consume(ArgumentQueue args) {
String translateOption(ArgumentQueue argQueue) {
OptionInfo option = null;
String[] optionNameAndOptionValue = null;
String argumentOrigin = argQueue.argumentOrigin;
OptionOrigin argumentOrigin = OptionOrigin.from(argQueue.argumentOrigin);
found: for (OptionInfo optionInfo : apiOptions.values()) {
for (String variant : optionInfo.variants) {
String optionName;
Expand Down