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.

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

8261088: Repeatable annotations without @Target cannot have containers that target module declarations #2412

Closed
wants to merge 1 commit into from

Conversation

@cushon
Copy link
Contributor

@cushon cushon commented Feb 4, 2021

Please review this fix to consolidate handling of default @Targets for repeated annotations, and permit repeatable annotations without an @Target to have container annotations that explicitly target MODULE.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8261088: Repeatable annotations without @target cannot have containers that target module declarations

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/2412/head:pull/2412
$ git checkout pull/2412

Update a local copy of the PR:
$ git checkout pull/2412
$ git pull https://git.openjdk.java.net/jdk pull/2412/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2412

View PR using the GUI difftool:
$ git pr show -t 2412

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/2412.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 4, 2021

👋 Welcome back cushon! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Feb 4, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Feb 4, 2021

@cushon The following label will be automatically applied to this pull request:

  • compiler

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.

@openjdk openjdk bot added the compiler label Feb 4, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 4, 2021

Webrevs

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 4, 2021

@cushon This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@cushon
Copy link
Contributor Author

@cushon cushon commented Mar 5, 2021

/csr needed

@openjdk openjdk bot added the csr label Mar 5, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 5, 2021

@cushon this pull request will not be integrated until the CSR request JDK-8261181 for issue JDK-8261088 has been approved.

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 21, 2021

@cushon This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 21, 2021

Mailing list message from Liam Miller-Cushon on compiler-dev:

Hello, is there any additional feedback on this change or the associated
CSR (JDK-8261181 <https://bugs.openjdk.java.net/browse/JDK-8261181>)?

On Thu, Feb 4, 2021 at 12:59 PM Liam Miller-Cushon <cushon at openjdk.java.net>
wrote:

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.openjdk.java.net/pipermail/compiler-dev/attachments/20210421/f23aee79/attachment.htm>

1 similar comment
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 21, 2021

Mailing list message from Liam Miller-Cushon on compiler-dev:

Hello, is there any additional feedback on this change or the associated
CSR (JDK-8261181 <https://bugs.openjdk.java.net/browse/JDK-8261181>)?

On Thu, Feb 4, 2021 at 12:59 PM Liam Miller-Cushon <cushon at openjdk.java.net>
wrote:

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.openjdk.java.net/pipermail/compiler-dev/attachments/20210421/f23aee79/attachment.htm>

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 14, 2021

Mailing list message from Liam Miller-Cushon on compiler-dev:

Any takers?

I think this is a relatively low-risk (and admittedly low-priority) change,
but it also has some code health value in that it deduplicates logic
related to @Target-less annotations.

There are currently two different lists of default @Target elements (one of
which is used for handling repeatable annotations, one for non-repeatable
annotations), and the lists are out of sync. Fixing this may reduce the
risk that they get further out of sync as new element kinds are added.

On Wed, Apr 21, 2021 at 10:31 AM Liam Miller-Cushon <cushon at google.com>
wrote:

Hello, is there any additional feedback on this change or the associated
CSR (JDK-8261181 <https://bugs.openjdk.java.net/browse/JDK-8261181>)?

On Thu, Feb 4, 2021 at 12:59 PM Liam Miller-Cushon <
cushon at openjdk.java.net> wrote:

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.openjdk.java.net/pipermail/compiler-dev/attachments/20210510/803cf240/attachment.htm>

1 similar comment
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 14, 2021

Mailing list message from Liam Miller-Cushon on compiler-dev:

Any takers?

I think this is a relatively low-risk (and admittedly low-priority) change,
but it also has some code health value in that it deduplicates logic
related to @Target-less annotations.

There are currently two different lists of default @Target elements (one of
which is used for handling repeatable annotations, one for non-repeatable
annotations), and the lists are out of sync. Fixing this may reduce the
risk that they get further out of sync as new element kinds are added.

On Wed, Apr 21, 2021 at 10:31 AM Liam Miller-Cushon <cushon at google.com>
wrote:

Hello, is there any additional feedback on this change or the associated
CSR (JDK-8261181 <https://bugs.openjdk.java.net/browse/JDK-8261181>)?

On Thu, Feb 4, 2021 at 12:59 PM Liam Miller-Cushon <
cushon at openjdk.java.net> wrote:

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.openjdk.java.net/pipermail/compiler-dev/attachments/20210510/803cf240/attachment.htm>

jbf
jbf approved these changes Jun 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 9, 2021

@cushon this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8261088
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict and removed rfr labels Jun 9, 2021
@openjdk openjdk bot added rfr and removed merge-conflict labels Jun 9, 2021
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 8, 2021

@cushon This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@cushon
Copy link
Contributor Author

@cushon cushon commented Jul 8, 2021

This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

This pull request is still active, I'm waiting for a CSR review: https://bugs.openjdk.java.net/browse/JDK-8261181?focusedCommentId=14431621&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-14431621

@openjdk openjdk bot removed the csr label Jul 28, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 28, 2021

@cushon 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:

8261088: Repeatable annotations without @Target cannot have containers that target module declarations

Reviewed-by: jfranck

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jul 28, 2021
@cushon
Copy link
Contributor Author

@cushon cushon commented Jul 28, 2021

/test

@openjdk
Copy link

@openjdk openjdk bot commented Jul 28, 2021

@cushon you need to get approval to run the tests in tier1 for commits up until 0154096

@openjdk openjdk bot added the test-request label Jul 28, 2021
@cushon
Copy link
Contributor Author

@cushon cushon commented Jul 28, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jul 28, 2021

Going to push as commit 84152e949f7500d25af2c80e9a38a4283546856b.
Since your change was applied there has been 1 commit pushed to the master branch:

  • dcdb1b6: 8137101: [TEST_BUG] javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java failure due to timing

Your commit was automatically rebased without conflicts.

@openjdk
Copy link

@openjdk openjdk bot commented Jul 28, 2021

@cushon An unexpected error occurred during integration. No push attempt will be made. The error has been logged and will be investigated. It is possible that this error is caused by a transient issue; feel free to retry the operation.

@cushon
Copy link
Contributor Author

@cushon cushon commented Jul 28, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jul 28, 2021

Going to push as commit 60c11fe.
Since your change was applied there has been 1 commit pushed to the master branch:

  • dcdb1b6: 8137101: [TEST_BUG] javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java failure due to timing

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 28, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jul 28, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 28, 2021

@cushon Pushed as commit 60c11fe.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants