8303784: no-@Target annotations should be applicable to type parameter declarations #12914

cushon · 2023-03-08T00:06:41Z

Please consider this fix for https://bugs.openjdk.org/browse/JDK-8303784, which make @Target-less annotations applicable to type parameter declarations.

@Target-less annotations are applicable to 'all declaration contexts', which includes type parameter declarations.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Change requires CSR request JDK-8304169 to be approved
Commit message must refer to an issue

Issues

JDK-8303784: no-@target annotations should be applicable to type parameter declarations
JDK-8304169: no-@target annotations should be applicable to type parameter declarations (CSR)

Reviewers

Vicente Romero (@vicente-romero-oracle - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/12914/head:pull/12914
$ git checkout pull/12914

Update a local copy of the PR:
$ git checkout pull/12914
$ git pull https://git.openjdk.org/jdk.git pull/12914/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12914

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12914.diff

Webrev

Link to Webrev Comment

…r declarations

bridgekeeper · 2023-03-08T00:07:59Z

👋 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 · 2023-03-08T00:12:15Z

@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.

mlbridge · 2023-03-08T00:16:04Z

Webrevs

vicente-romero-oracle

looks sensible

test/langtools/tools/javac/annotations/NoTargetOnTypeParameterDeclaration.java

openjdk · 2023-03-14T15:45:38Z

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

8303784: no-@Target annotations should be applicable to type parameter declarations

Reviewed-by: vromero

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.

vicente-romero-oracle · 2023-03-14T17:49:57Z

test/langtools/tools/javac/annotations/typeAnnotations/NoTargetOnTypeParameterDeclaration.java

jddarcy · 2023-03-14T18:31:24Z

/csr needed

jddarcy · 2023-03-14T18:31:49Z

Please file a CSR to review the change in behavior of javac to conform with the spec.

openjdk · 2023-03-14T18:32:46Z

@jddarcy has indicated that a compatibility and specification (CSR) request is needed for this pull request.

@cushon please create a CSR request for issue JDK-8303784 with the correct fix version. This pull request cannot be integrated until the CSR request is approved.

based on discussion in CSR.

cushon · 2023-03-21T18:05:47Z

I updated the patch so the change only applies for --release >= 14, based on feedback in the CSR

vicente-romero-oracle

looks good, added a minor suggestion

test/langtools/tools/javac/annotations/typeAnnotations/NoTargetOnTypeParameterDeclaration.java

jddarcy · 2023-03-23T04:28:19Z

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java

@@ -3512,7 +3512,7 @@ boolean isOverrider(Symbol s) {
    protected boolean isTypeAnnotation(JCAnnotation a, boolean isTypeParameter) {
        List<Attribute> targets = typeAnnotations.annotationTargets(a.annotationType.type.tsym);
        return (targets == null) ?
-                false :
+                (source.compareTo(Source.JDK14) >= 0 && isTypeParameter) :


Usually this kind of test is done using a constant in the Feature enum; I'll let Vicente or other engineer who focuses on javac weigh in on whether or not the direct comparison is acceptable in this case.

right I agree we should add a new member to the Feature enum

Will do, do you have an preferences for the name of the new constant? Maybe NO_TARGET_ANNOTATIONS_ARE_APPLICABLE_TO_TYPE_PARAMETER_DECLARATIONS?

not really but that one seems too long tbh

I went with NO_TARGET_ANNOTATION_APPLICABILITY, I'm happy to rename it

vicente-romero-oracle

looks good

bridgekeeper · 2023-05-01T23:54:15Z

@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 · 2023-05-02T18:17:13Z

/integrate

openjdk · 2023-05-02T18:19:20Z

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

b76f320: 8307123: Fix deprecation warnings in DPrinter

Your commit was automatically rebased without conflicts.

openjdk · 2023-05-02T18:19:39Z

@cushon Pushed as commit 8c106b0.

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

8303784: no-@target annotations should be applicable to type paramete…

5be37a4

…r declarations

openjdk bot added the rfr Pull request is ready for review label Mar 8, 2023

openjdk bot added the compiler compiler-dev@openjdk.org label Mar 8, 2023

vicente-romero-oracle approved these changes Mar 14, 2023

View reviewed changes

test/langtools/tools/javac/annotations/NoTargetOnTypeParameterDeclaration.java Outdated Show resolved Hide resolved

Move test under test/langtools/tools/javac/annotations/typeAnnotations

d88c6d1

openjdk bot added the ready Pull request is ready to be integrated label Mar 14, 2023

vicente-romero-oracle reviewed Mar 14, 2023

View reviewed changes

test/langtools/tools/javac/annotations/typeAnnotations/NoTargetOnTypeParameterDeclaration.java

Copy link

Contributor

vicente-romero-oracle Mar 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

vicente-romero-oracle approved these changes Mar 14, 2023

View reviewed changes

openjdk bot added the csr Pull request needs approved CSR before integration label Mar 14, 2023

openjdk bot removed the ready Pull request is ready to be integrated label Mar 14, 2023

Make fix contingent on --release 14

5374314

based on discussion in CSR.

vicente-romero-oracle approved these changes Mar 23, 2023

View reviewed changes

test/langtools/tools/javac/annotations/typeAnnotations/NoTargetOnTypeParameterDeclaration.java Show resolved Hide resolved

jddarcy reviewed Mar 23, 2023

View reviewed changes

openjdk bot added ready Pull request is ready to be integrated and removed csr Pull request needs approved CSR before integration labels Mar 23, 2023

cushon added 2 commits March 23, 2023 07:44

Add a test case with no --release flag

57c4515

Use Feature enum for version checks

749af3c

vicente-romero-oracle approved these changes Mar 24, 2023

View reviewed changes

Merge branch 'master' into JDK-8303784

6b03a47

openjdk bot added the integrated Pull request has been integrated label May 2, 2023

openjdk bot closed this May 2, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8303784: no-@Target annotations should be applicable to type parameter declarations #12914

8303784: no-@Target annotations should be applicable to type parameter declarations #12914

cushon commented Mar 8, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Mar 8, 2023

openjdk bot commented Mar 8, 2023

mlbridge bot commented Mar 8, 2023 •

edited

Loading

vicente-romero-oracle left a comment

openjdk bot commented Mar 14, 2023 •

edited

Loading

vicente-romero-oracle Mar 14, 2023

jddarcy commented Mar 14, 2023

jddarcy commented Mar 14, 2023

openjdk bot commented Mar 14, 2023

cushon commented Mar 21, 2023

vicente-romero-oracle left a comment

jddarcy Mar 23, 2023

vicente-romero-oracle Mar 24, 2023

cushon Mar 24, 2023

vicente-romero-oracle Mar 24, 2023

cushon Mar 24, 2023

vicente-romero-oracle left a comment

bridgekeeper bot commented May 1, 2023

cushon commented May 2, 2023

openjdk bot commented May 2, 2023

openjdk bot commented May 2, 2023

8303784: no-@Target annotations should be applicable to type parameter declarations #12914

8303784: no-@Target annotations should be applicable to type parameter declarations #12914

Conversation

cushon commented Mar 8, 2023 • edited by openjdk bot Loading

Progress

Issues

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Mar 8, 2023

openjdk bot commented Mar 8, 2023

mlbridge bot commented Mar 8, 2023 • edited Loading

Webrevs

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

openjdk bot commented Mar 14, 2023 • edited Loading

vicente-romero-oracle Mar 14, 2023

Choose a reason for hiding this comment

jddarcy commented Mar 14, 2023

jddarcy commented Mar 14, 2023

openjdk bot commented Mar 14, 2023

cushon commented Mar 21, 2023

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

jddarcy Mar 23, 2023

Choose a reason for hiding this comment

vicente-romero-oracle Mar 24, 2023

Choose a reason for hiding this comment

cushon Mar 24, 2023

Choose a reason for hiding this comment

vicente-romero-oracle Mar 24, 2023

Choose a reason for hiding this comment

cushon Mar 24, 2023

Choose a reason for hiding this comment

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

bridgekeeper bot commented May 1, 2023

cushon commented May 2, 2023

openjdk bot commented May 2, 2023

openjdk bot commented May 2, 2023

cushon commented Mar 8, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Mar 8, 2023 •

edited

Loading

openjdk bot commented Mar 14, 2023 •

edited

Loading