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

8138732: Rename @HotSpotIntrinsicCandidate to @IntrinsicCandidate and move it to the jdk.internal.vm.annotation package #45

Closed
wants to merge 2 commits into from

Conversation

marschall
Copy link
Contributor

@marschall marschall commented Sep 7, 2020

Hello, newbie here

I picked JDK-8138732 to work on because it has a "starter" label and I believe I understand what to do.

  • I tried to update the copyright year to 2020 in every file.
  • I decided to change @since from 9 to 16 since it is a new annotation name in a new package.
  • I tried to keep code changes to a minimum, eg not change to imports if fully qualified class names are used instead of imports. In some cases I did minor reordering of imports to keep them sorted alphabetically.
  • All tier1 tests pass.
  • One jpackage/jlink tier2 test fails but I don't believe it is related.
  • Some tier3 Swing tests fail but I don't think they are related.

Progress

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

Issue

  • JDK-8138732: Rename @HotSpotIntrinsicCandidate to @IntrinsicCandidate and move it to the jdk.internal.vm.annotation package

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/45/head:pull/45
$ git checkout pull/45

@bridgekeeper bridgekeeper bot added the oca Needs verification of OCA signatory status label Sep 7, 2020
@bridgekeeper
Copy link

bridgekeeper bot commented Sep 7, 2020

Hi @marschall, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user marschall" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

@openjdk
Copy link

openjdk bot commented Sep 7, 2020

@marschall The following labels will be automatically applied to this pull request: build core-libs hotspot i18n nio security.

When this pull request is ready to be reviewed, an RFR email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label (add|remove) "label" command.

@openjdk openjdk bot added security security-dev@openjdk.org nio nio-dev@openjdk.org build build-dev@openjdk.org hotspot hotspot-dev@openjdk.org core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org labels Sep 7, 2020
@marschall
Copy link
Contributor Author

marschall commented Sep 7, 2020

/signed

@bridgekeeper bridgekeeper bot added the oca-verify Needs verification of OCA signatory status label Sep 7, 2020
@bridgekeeper
Copy link

bridgekeeper bot commented Sep 7, 2020

Thank you! Please allow for up to two weeks to process your OCA, although it is usually done within one to two business days. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

@marschall marschall changed the title 8138732: Rename HotSpotIntrinsicCandidate to IntrinsicCandidate 8138732: Rename @HotSpotIntrinsicCandidate to @IntrinsicCandidate and move it to the jdk.internal.vm.annotation package Sep 7, 2020
@bridgekeeper bridgekeeper bot removed oca Needs verification of OCA signatory status oca-verify Needs verification of OCA signatory status labels Sep 7, 2020
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 7, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 7, 2020

Webrevs

  • 05: Full (bf7aa62)
  • 04: Full (25d9472)
  • 03: Full (247168f993946a55d117ea913107e0f7a5f8c140)
  • 02: Full (5c495602de3da3c963da6d5b764498ecce56d4d1)
  • 01: Full - Incremental (1c9dd9da6dea509cc50e46dc0c1b630d429be7b0)
  • 00: Full (47328f4bed07c116dc4dafe6642c062e70a4e66c)

@AlanBateman
Copy link
Contributor

AlanBateman commented Sep 7, 2020

This one probably needs discussion on hotspot-dev to get agreement on the rename/move. It might need coordination with Graal. If the change does go ahead then please check if java.base's module-info.java still needs to export jdk.internal to jdk.jfr, I suspect that qualified export can be removed.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

The changes all look good to me.

@openjdk
Copy link

openjdk bot commented Sep 8, 2020

@marschall 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 more details.

After integration, the commit message for the final commit will be:

8138732: Rename @HotSpotIntrinsicCandidate to @IntrinsicCandidate and move it to the jdk.internal.vm.annotation package

Reviewed-by: dholmes, alanb, psandoz, kvn, egahlin

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

  • 840aa2b: 8253424: Add support for running pre-submit testing using GitHub Actions
  • 8e87d46: 8252857: AArch64: Shenandoah C1 CAS is not sequentially consistent
  • c2692f8: 8225329: -XX:+PrintBiasedLockingStatistics causes crash during initia…
  • e9c1782: 8252752: Clear card table for old regions during scan in G1
  • 276fcee: 8252835: Revert fix for JDK-8246051
  • ca1ed16: 8253639: Change os::attempt_reserve_memory_at parameter order
  • fed3636: 8252219: C2: Randomize IGVN worklist for stress testing
  • 625a935: 8253638: Cleanup os::reserve_memory and remove MAP_FIXED
  • f014854: 8253624: gtest fails when run from make with read-only source directory

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@dholmes-ora, @AlanBateman, @PaulSandoz, @vnkozlov, @egahlin) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 8, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 8, 2020

Mailing list message from David Holmes on i18n-dev:

Hi Philippe,

On 8/09/2020 3:08 am, Philippe Marschall wrote:

Hello, newbie here

Welcome aboard!

I picked JDK-8138732 to work on because it has a "starter" label and I believe I understand what to do.

- I tried to update the copyright year to 2020 in every file.
- I decided to change `@since` from 9 to 16 since it is a new annotation name in a new package.

That's somewhat debatable, but I don't think @SInCE really serves any
useful purpose on non-public APIs, so I'm fine either way.

- I tried to keep code changes to a minimum, eg not change to imports if fully qualified class names are used instead of
imports. In some cases I did minor reordering of imports to keep them sorted alphabetically.

The changes all look good to me.

Thanks,
David
-----

@mlbridge
Copy link

mlbridge bot commented Sep 9, 2020

Mailing list message from Philippe Marschall on nio-dev:

On Mon, Sep 7, 2020 at 7:54 PM Alan Bateman <alanb at openjdk.java.net> wrote:

On Mon, 7 Sep 2020 09:44:09 GMT, Philippe Marschall <github.com+471021+marschall at openjdk.org> wrote:

Hello, newbie here

I picked JDK-8138732 to work on because it has a "starter" label and I believe I understand what to do.

- I tried to update the copyright year to 2020 in every file.
- I decided to change `@since` from 9 to 16 since it is a new annotation name in a new package.
- I tried to keep code changes to a minimum, eg not change to imports if fully qualified class names are used instead of
imports. In some cases I did minor reordering of imports to keep them sorted alphabetically.
- All tier1 tests pass.
- One jpackage/jlink tier2 test fails but I don't believe it is related.
- Some tier3 Swing tests fail but I don't think they are related.

This one probably needs discussion on hotspot-dev to get agreement on the rename/move. It might need coordination with
Graal.

I sent out mails to hotspot-dev and graal-dev.

If the change does go ahead then please check if java.base's module-info.java still needs to export jdk.internal
to jdk.jfr, I suspect that qualified export can be removed.

You're correct we can replace the jdk.internal export with the
jdk.internal.vm.annotation export. I updated the PR accordingly.

Cheers
Philippe

@vnkozlov
Copy link
Contributor

vnkozlov commented Sep 11, 2020

/reviewer add vnkozlov

@openjdk
Copy link

openjdk bot commented Sep 11, 2020

@vnkozlov Only the author (@marschall) is allowed to issue the reviewer command.

@vnkozlov
Copy link
Contributor

vnkozlov commented Sep 11, 2020

You should consider upstreaming Graal changes (jdk.internal.vm.compiler) into https://github.com/oracle/graal
Otherwise next time we do "Update Graal" in JDK they will be overwritten.

@vnkozlov
Copy link
Contributor

vnkozlov commented Sep 11, 2020

Changes look good. I ran hs-tier1 and hs-tier3 test jobs which run Graal tests and they passed.

@openjdk openjdk bot removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated labels Sep 23, 2020
@dholmes-ora
Copy link
Member

dholmes-ora commented Sep 23, 2020

@marschall Please do not force-push anything as it breaks the commit history in the PR and renders previous reviews/comments obsolete. There is no way for the reviewers to see what changed between the commit they reviewed and the commit now in the PR.

To update to latest changes you should have just merged your branch with your (up-to-date) local master, committed that merge in your local branch and then pushed that commit to your Personal Fork. The skara tooling will flatten the series of commits in a PR into one single well-formed commit that is pushed to the master branch of the repo.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Sep 23, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 23, 2020

Mailing list message from Philippe Marschall on hotspot-dev:

On 22.09.20 10:45, Erik Gahlin wrote:

On Sat, 12 Sep 2020 00:19:00 GMT, Vladimir Kozlov <kvn at openjdk.org> wrote:

Philippe Marschall has refreshed the contents of this pull request, and previous commits have been removed. The
incremental views will show differences compared to the previous content of the PR. The pull request contains one new
commit since the last revision:
8138732: Rename HotSpotIntrinsicCandidate to IntrinsicCandidate

Marked as reviewed by kvn (Reviewer).

Have you run the JFR tests in test/jdk/jdk/jfr?

I initially did not but now I have.
jdk.jfr.event.runtime.TestModuleEvents was failing, I have updated it to
what makes sense to me.

Cheers
Philippe

@mlbridge
Copy link

mlbridge bot commented Sep 23, 2020

Mailing list message from Philippe Marschall on hotspot-dev:

On 23.09.20 07:13, David Holmes wrote:

On Tue, 22 Sep 2020 08:43:04 GMT, Erik Gahlin <egahlin at openjdk.org> wrote:

Marked as reviewed by kvn (Reviewer).

Have you run the JFR tests in test/jdk/jdk/jfr?

@marschall Please do not force-push anything as it breaks the commit history in the PR and renders previous
reviews/comments obsolete. There is no way for the reviewers to see what changed between the commit they reviewed and
the commit now in the PR.

To update to latest changes you should have just merged your branch with your (up-to-date) local master, committed that
merge in your local branch and then pushed that commit to your Personal Fork. The skara tooling will flatten the series
of commits in a PR into one single well-formed commit that is pushed to the master branch of the repo.

My apologies, I was not aware of this, I won't make this mistake in the
future again. I don't assume there is a way to fix this now.

Philippe

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Update seems fine. Thanks for JFR testing and fixing.

@vnkozlov
Copy link
Contributor

vnkozlov commented Sep 23, 2020

@marschall I will sponsor it after you integrate the latest update.

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Sep 25, 2020
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Sep 27, 2020
@marschall
Copy link
Contributor Author

marschall commented Sep 27, 2020

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 27, 2020
@openjdk
Copy link

openjdk bot commented Sep 27, 2020

@marschall
Your change (at version bf7aa62) is now ready to be sponsored by a Committer.

@marschall
Copy link
Contributor Author

marschall commented Sep 28, 2020

@vnkozlov done, I hope I now made it correctly with a merge commit for the latest merge conflict

@vnkozlov
Copy link
Contributor

vnkozlov commented Sep 30, 2020

hs-tier1, hs-tier3-graal testing passed

@vnkozlov
Copy link
Contributor

vnkozlov commented Sep 30, 2020

/sponsor

@openjdk openjdk bot closed this Sep 30, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 30, 2020
@openjdk
Copy link

openjdk bot commented Sep 30, 2020

@vnkozlov @marschall Since your change was applied there have been 58 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit 2a406f3.

💡 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
Labels
build build-dev@openjdk.org core-libs core-libs-dev@openjdk.org hotspot hotspot-dev@openjdk.org i18n i18n-dev@openjdk.org integrated Pull request has been integrated nio nio-dev@openjdk.org security security-dev@openjdk.org
6 participants