8354090: Refactor import warning suppression in Check.java #24532
Conversation
|
👋 Welcome back acobbs! A progress list of the required criteria for merging this PR into |
|
@archiecobbs This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 749 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
|
@archiecobbs The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
| @@ -3823,10 +3826,10 @@ void checkPreview(DiagnosticPosition pos, Symbol other, Type site, Symbol s) { | |||
| log.error(pos, Errors.IsPreview(s)); | |||
| } else { | |||
| preview.markUsesPreview(pos); | |||
| deferredLintHandler.report(_l -> warnPreviewAPI(pos, LintWarnings.IsPreview(s))); | |||
There was a problem hiding this comment.
We don't defer here because we want warnPreviewAPI() to use the current value of importSuppression, not some later value. But these warnings didn't really need to be deferred in the first place - because we can just use the current Lint instance, and in fact, that's what it was already doing. But a side effect of these changes is that the warnings checked in the PreviewAutoSuppress.java regression test get reordered.
| @@ -228,6 +234,12 @@ Lint setLint(Lint newLint) { | |||
| return prev; | |||
| } | |||
|
|
|||
| boolean setImportSuppression(boolean newImportSuppression) { | |||
| boolean prev = importSuppression; | |||
| importSuppression = newImportSuppression; | |||
There was a problem hiding this comment.
This is fine. Another alternative that I'm mentioning for completeness would have been for attribImportType to set a flag on AttrContext (and then augment some of the methods in Check to accept an extra env parameter).
|
/integrate |
|
Going to push as commit e50af6d.
Your commit was automatically rebased without conflicts. |
openjdk
bot
removed
ready
|
@archiecobbs Pushed as commit e50af6d. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
|
Thanks for the review! |
This is split off as a sub-task of JDK-8224228, which seeks to add
@SuppressWarningssupport for lexical features.In JDK 9 and later, there is a special exception to the normal rules for deprecation and preview warnings, which is that these warnings are automatically suppressed for import statements. This is because an import statement is just a lexical shortcut, not an actual use of the symbol.
The current code in
Check.javaimplements this by manipulating the currentLintinstance directly, but this operation is incompatible upcoming changes to deferred lint handling. Instead, there can be an explicit flag for "import warning suppression" inCheck.javato handle this. This will also make the code a bit clearer.Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24532/head:pull/24532$ git checkout pull/24532Update a local copy of the PR:
$ git checkout pull/24532$ git pull https://git.openjdk.org/jdk.git pull/24532/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 24532View PR using the GUI difftool:
$ git pr show -t 24532Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24532.diff
Using Webrev
Link to Webrev Comment