Add --release flag support
#1473
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The java compiler does not allow `-source` and `-target` to be specified explicitly when `--release` is [1], but does add them in response to passing `--release` [2]. As such `SuggestedFixes#compilesWithFix` must compensate for this by removing `-source` and `-target` before triggering another compilation round. Fixes google#1265. [1] https://hg.openjdk.java.net/jdk/jdk11/file/1ddf9a99e4ad/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java#l297 [2] https://hg.openjdk.java.net/jdk/jdk11/file/1ddf9a99e4ad/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java#l315
Stephan202
commented
Jan 12, 2020
Comment on lines
+1032
to
+1033
| if ((key.equals(Option.SOURCE.getPrimaryName()) || key.equals(Option.TARGET.getPrimaryName())) | ||
| && originalOptions.isSet(Option.RELEASE)) { |
There was a problem hiding this comment.
This code can be optimized by factoring out originalOptions.isSet(Option.RELEASE) and creating a set containing Option.SOURCE.getPrimaryName() and Option.TARGET.getPrimaryName(). Decided against this because I figured it'd make this already-very-long method even more complex to follow. Let me know if you feel differently and I'll change it.
cushon
reviewed
May 12, 2020
| @@ -1023,11 +1024,17 @@ public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOExcept | |||
| Options originalOptions = Options.instance(javacTask.getContext()); | |||
| for (String key : originalOptions.keySet()) { | |||
| String value = originalOptions.get(key); | |||
| if (key.equals("-Xplugin:") && value.startsWith("ErrorProne")) { | |||
There was a problem hiding this comment.
I'd rather use the string names of the flags here. com.sun.tools.javac.main.Optionn is an unsupported internal API that has changed in the past, and the literal flag names are part of javac's supported API.
There was a problem hiding this comment.
Ack! Since you assigned the PR to yourself: want me to update this, or have you already applied those changes internally?
Merged
kluever
pushed a commit
that referenced
this pull request
May 13, 2020
The java compiler does not allow `-source` and `-target` to be specified explicitly when `--release` is [1], but does add them in response to passing `--release` [2]. As such `SuggestedFixes#compilesWithFix` must compensate for this by removing `-source` and `-target` before triggering another compilation round. Fixes #1265. [1] https://hg.openjdk.java.net/jdk/jdk11/file/1ddf9a99e4ad/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java#l297 Fixes #1473 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=311235043
kluever
pushed a commit
that referenced
this pull request
May 13, 2020
The java compiler does not allow `-source` and `-target` to be specified explicitly when `--release` is [1], but does add them in response to passing `--release` [2]. As such `SuggestedFixes#compilesWithFix` must compensate for this by removing `-source` and `-target` before triggering another compilation round. Fixes #1265. [1] https://hg.openjdk.java.net/jdk/jdk11/file/1ddf9a99e4ad/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java#l297 Fixes #1473 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=311235043
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The java compiler does not allow
-sourceand-targetto be specified explicitly when--releaseis, but does add them in response to passing--release. As suchSuggestedFixes#compilesWithFixmust compensate for this by removing-sourceand-targetbefore triggering another compilation round.Fixes #1265.