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

JDK-8309870: Using -proc:full should be considered requesting explicit annotation processing #14423

Closed
wants to merge 2 commits into from

Conversation

jddarcy
Copy link
Member

@jddarcy jddarcy commented Jun 12, 2023

Address a small omission to the recent addition of "javac -proc:full", regard "-proc:full" as explicitly requesting annotation processing. Also add "-A" to the list of options indicating explicit annotation processing was requested.

The intention is to backport this bug fix to JDK 21 too.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8309870: Using -proc:full should be considered requesting explicit annotation processing (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14423

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 12, 2023

👋 Welcome back darcy! 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 Pull request is ready for review label Jun 12, 2023
@openjdk
Copy link

openjdk bot commented Jun 12, 2023

@jddarcy 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 compiler-dev@openjdk.org label Jun 12, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 12, 2023

Webrevs

Comment on lines 92 to 96
/*
* Maintenance note: when adding new annotation processing related
* options, the list of options regarded as requesting explicit
* annotation processing in JavaCompiler should be updated.
*/
Copy link
Contributor

Choose a reason for hiding this comment

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

(minor) consider moving this option to before the declaration of Option so that it seems less like it applies to the first member. It could even be an @implNote on the enum.

Copy link
Contributor

@jonathan-gibbons jonathan-gibbons left a comment

Choose a reason for hiding this comment

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

Approved, with suggestion to relocate comment.

@openjdk
Copy link

openjdk bot commented Jun 12, 2023

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

8309870: Using -proc:full should be considered requesting explicit annotation processing

Reviewed-by: jjg

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 17 new commits pushed to the master branch:

  • 1612b6d: 8309752: com/sun/jdi/SetLocalWhileThreadInNative.java fails with virtual test thread factory due to OpaqueFrameException
  • 45414fc: 8307858: [REDO] JDK-8307194 Add make target for optionally building a complete set of all JDK and hotspot libjvm static libraries
  • a6ad42e: 8308645: Javadoc of FFM API needs to be refreshed
  • 0727507: 8272147: Consolidate preserved marks handling with other STW collectors
  • 6cd166a: 8309403: Serial: Remove the useless adaptive size policy in GenCollectedHeap
  • 5d5ae35: 8308966: Add intrinsic for float/double modulo for x86 AVX2 and AVX512
  • 8e4e6b0: 8309761: Leak class loader constraints
  • fdaa2c4: 8309306: G1: Move is_obj_dead from HeapRegion to G1CollectedHeap
  • 4bc6bbb: 8309814: [IR Framework] Dump socket output string in which IR encoding was not found
  • cf9e635: 8309462: [AIX] vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/TestDescription.java crashing due to empty while loop
  • ... and 7 more: https://git.openjdk.org/jdk/compare/16c3d53b1bb60b1c1570731041f564bf13b45098...master

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 12, 2023
@jddarcy
Copy link
Member Author

jddarcy commented Jun 12, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jun 12, 2023

Going to push as commit 3ce1240.
Since your change was applied there have been 17 commits pushed to the master branch:

  • 1612b6d: 8309752: com/sun/jdi/SetLocalWhileThreadInNative.java fails with virtual test thread factory due to OpaqueFrameException
  • 45414fc: 8307858: [REDO] JDK-8307194 Add make target for optionally building a complete set of all JDK and hotspot libjvm static libraries
  • a6ad42e: 8308645: Javadoc of FFM API needs to be refreshed
  • 0727507: 8272147: Consolidate preserved marks handling with other STW collectors
  • 6cd166a: 8309403: Serial: Remove the useless adaptive size policy in GenCollectedHeap
  • 5d5ae35: 8308966: Add intrinsic for float/double modulo for x86 AVX2 and AVX512
  • 8e4e6b0: 8309761: Leak class loader constraints
  • fdaa2c4: 8309306: G1: Move is_obj_dead from HeapRegion to G1CollectedHeap
  • 4bc6bbb: 8309814: [IR Framework] Dump socket output string in which IR encoding was not found
  • cf9e635: 8309462: [AIX] vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/TestDescription.java crashing due to empty while loop
  • ... and 7 more: https://git.openjdk.org/jdk/compare/16c3d53b1bb60b1c1570731041f564bf13b45098...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 12, 2023
@openjdk openjdk bot closed this Jun 12, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 12, 2023
@openjdk
Copy link

openjdk bot commented Jun 12, 2023

@jddarcy Pushed as commit 3ce1240.

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

@jddarcy
Copy link
Member Author

jddarcy commented Jun 12, 2023

/backport jdk21

@openjdk
Copy link

openjdk bot commented Jun 12, 2023

@jddarcy the backport was successfully created on the branch jddarcy-backport-3ce1240c in my personal fork of openjdk/jdk21. To create a pull request with this backport targeting openjdk/jdk21:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 3ce1240c from the openjdk/jdk repository.

The commit being backported was authored by Joe Darcy on 12 Jun 2023 and was reviewed by Jonathan Gibbons.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21:

$ git fetch https://github.com/openjdk-bots/jdk21.git jddarcy-backport-3ce1240c:jddarcy-backport-3ce1240c
$ git checkout jddarcy-backport-3ce1240c
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21.git jddarcy-backport-3ce1240c

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler compiler-dev@openjdk.org integrated Pull request has been integrated
2 participants