Fix jdk17 incompatibility of ClassInitializationDeadlock #1936
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
Generate changelog in
|
carterkozak
reviewed
Oct 18, 2021
|
|
||
| /** | ||
| * A compatibility wrapper around {@link com.sun.tools.javac.util.Filter}. | ||
| * Adapted from {@link com.google.errorprone.util.ErrorProneScope} with additional methods. |
There was a problem hiding this comment.
Let's add a link to ErrorProneScope.java upstream at the commit we borrowed from and note the license (Apache 2.0)
carterkozak
approved these changes
Oct 18, 2021
|
Released 4.29.0 |
This was referenced Oct 18, 2021
Merged
bulldozer-bot bot
pushed a commit
to palantir/witchcraft-api
that referenced
this pull request
Oct 18, 2021
###### _excavator_ is a bot for automating changes across repositories. Changes produced by the roomba/latest-baseline-oss check. # Release Notes ## 4.29.0 | Type | Description | Link | | ---- | ----------- | ---- | | Fix | Fix jdk17 incompatibility of ClassInitializationDeadlock | palantir/gradle-baseline#1936 | To enable or disable this check, please contact the maintainers of Excavator.
This was referenced Oct 18, 2021
copybara-service bot
pushed a commit
to google/error-prone
that referenced
this pull request
Oct 19, 2021
Add a compatibility helper method for `getSymbols(Predicate<Symbol>, LookupKind)`. **Context:** In [gradle-baseline](https://github.com/palantir/gradle-baseline#baseline-error-prone-checks), we maintain our own set of error-prone rules and ran into similar JDK 17 compatibility problems as mentioned in #2330. However for our custom rules, we also need a compatibility helper for `getSymbols(Predicate, LookupKind)`. For now, we work around this by copying parts of the `ErrorProneScope` class (([PR](palantir/gradle-baseline#1936))) but ideally we could reuse the existing helper and wouldn't have to maintain our own fork of this class. Fixes #2629 COPYBARA_INTEGRATE_REVIEW=#2629 from fawind:fw/get-symbols-lookup-kind e843406 PiperOrigin-RevId: 404111704
|
google/error-prone#2629 got merged so with the next error-prone release we should be good to remove our fork of |
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.
Before this PR
When compiling with JDK 17 you get the following error:
This is due to breaking changes to the
com.sun.tools.javac.util.FilterAPI.Upstream error-prone also ran into this problem (issue, PR). They fixed this by adding a "compatibility wrapper" around
Filter:ErrorProneScope.java. Unfortunately, the error-prone compatibility wrapper only provides the methodgetSymbols(Predicate<Symbol>)but not the methodgetSymbols(Predicate<Symbol>, LookupKind)which is the one we need.After this PR
Closes #1926
ErrorProneScope, adding the missing method.==COMMIT_MSG==
Fix jdk17 incompatibility of ClassInitializationDeadlock
==COMMIT_MSG==
Possible downsides?
We don't have testing infra for jdk17 yet, so the jdk17 codepath is untested (although I tested in a local project).