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

marschall · 2020-09-07T09:44:09Z

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

David Holmes (@dholmes-ora - Reviewer) ⚠️ Review applies to 47328f4bed07c116dc4dafe6642c062e70a4e66c
Alan Bateman (@AlanBateman - Reviewer) ⚠️ Review applies to 1c9dd9da6dea509cc50e46dc0c1b630d429be7b0
Paul Sandoz (@PaulSandoz - Reviewer) ⚠️ Review applies to 1c9dd9da6dea509cc50e46dc0c1b630d429be7b0
Vladimir Kozlov (@vnkozlov - Reviewer) ⚠️ Review applies to 25d9472
Erik Gahlin (@egahlin - Reviewer) ⚠️ Review applies to 25d9472

Download

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

bridgekeeper · 2020-09-07T09:45:39Z

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 · 2020-09-07T09:46:37Z

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

marschall · 2020-09-07T09:58:38Z

/signed

bridgekeeper · 2020-09-07T10:00:57Z

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!

mlbridge · 2020-09-07T17:08:38Z

Webrevs

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

AlanBateman · 2020-09-07T17:51:24Z

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.

dholmes-ora

The changes all look good to me.

openjdk · 2020-09-08T01:11:59Z

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

mlbridge · 2020-09-08T01:12:38Z

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 · 2020-09-09T09:46:48Z

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 · 2020-09-11T21:51:27Z

/reviewer add vnkozlov

openjdk · 2020-09-11T21:52:25Z

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

vnkozlov · 2020-09-11T21:53:12Z

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 · 2020-09-11T21:55:26Z

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

mlbridge · 2020-09-23T18:42:31Z

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 · 2020-09-23T18:44:29Z

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

vnkozlov

Update seems fine. Thanks for JFR testing and fixing.

vnkozlov · 2020-09-23T22:47:47Z

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

marschall · 2020-09-27T19:03:09Z

/integrate

openjdk · 2020-09-27T19:04:06Z

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

marschall · 2020-09-28T19:08:04Z

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

vnkozlov · 2020-09-30T20:03:09Z

hs-tier1, hs-tier3-graal testing passed

vnkozlov · 2020-09-30T20:03:18Z

/sponsor

openjdk · 2020-09-30T20:05:25Z

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

4b16f8a: 8253872: ArgumentHandler must use the same delimiters as in jvmti_tools.cpp
4fb8c77: 8253733: Cleanup internal taglet API
e5ba020: 8253829: Wrong length compared in SSPI bridge
9e453d9: 8239090: Improve CPU feature support in VM_Version
8f7c9a7: 8252001: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jdi
8cf8e46: 8253700: spurious "extends Throwable" at end of Optional.orElseThrow method declaration
8b3d676: 8238737: remove DeoptimizeAllClassesRate from CTW library
709cfe5: 8253815: Remove unused HeapRegionManager::_num_committed from SA
f80a606: 8253375: OSX build fails with Xcode 12.0 (12A7209)
04775f1: 8253768: Deleting unused pipe_class definitions in adl-file (x86_64.ad).
... and 48 more: https://git.openjdk.java.net/jdk/compare/7817963ce91384380fe65005a6c438b08b022bad...master

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.

…jdk#45) * JVM-2061: materialize an object that contains its own reference * Don't emit "PEAState" when it is empty. --------- Co-authored-by: Xin Liu <xxinliu@amazon.com>

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

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

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

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 bot removed oca Needs verification of OCA signatory status oca-verify Needs verification of OCA signatory status labels Sep 7, 2020

openjdk bot added the rfr Pull request is ready for review label Sep 7, 2020

dholmes-ora approved these changes Sep 8, 2020

View reviewed changes

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

marschall force-pushed the JDK-8138732 branch from 47328f4 to 1c9dd9d Compare September 9, 2020 09:43

AlanBateman approved these changes Sep 10, 2020

View reviewed changes

PaulSandoz approved these changes Sep 10, 2020

View reviewed changes

marschall force-pushed the JDK-8138732 branch from 247168f to 25d9472 Compare September 23, 2020 18:36

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

vnkozlov approved these changes Sep 23, 2020

View reviewed changes

egahlin approved these changes Sep 23, 2020

View reviewed changes

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

Merge branch 'master' into JDK-8138732

bf7aa62

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

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

openjdk bot closed this Sep 30, 2020

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

yftsai mentioned this pull request Feb 17, 2022

8005885: enhance PrintCodeCache to print more data #7389

Closed

3 tasks

asotona pushed a commit to asotona/jdk that referenced this pull request Feb 6, 2023

Flip assertEquals calls in Classfile API tests (openjdk#45)

814b28e

asotona pushed a commit to asotona/jdk that referenced this pull request Feb 6, 2023

Flip assertEquals calls in Classfile API tests (openjdk#45)

7eb7d38

haimaychao mentioned this pull request Sep 19, 2023

8304956: Update KeyStore.getDefaultType() specification to return pkcs12 as fallback #15625

Closed

4 tasks

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

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

marschall commented Sep 7, 2020 •

edited by openjdk bot

bridgekeeper bot commented Sep 7, 2020

openjdk bot commented Sep 7, 2020

marschall commented Sep 7, 2020

bridgekeeper bot commented Sep 7, 2020

mlbridge bot commented Sep 7, 2020 •

edited

AlanBateman commented Sep 7, 2020

dholmes-ora left a comment

openjdk bot commented Sep 8, 2020 •

edited

mlbridge bot commented Sep 8, 2020

mlbridge bot commented Sep 9, 2020

vnkozlov commented Sep 11, 2020

openjdk bot commented Sep 11, 2020

vnkozlov commented Sep 11, 2020

vnkozlov commented Sep 11, 2020

mlbridge bot commented Sep 23, 2020

mlbridge bot commented Sep 23, 2020

vnkozlov left a comment

vnkozlov commented Sep 23, 2020

marschall commented Sep 27, 2020

openjdk bot commented Sep 27, 2020

marschall commented Sep 28, 2020

vnkozlov commented Sep 30, 2020

vnkozlov commented Sep 30, 2020

openjdk bot commented Sep 30, 2020

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

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

Conversation

marschall commented Sep 7, 2020 • edited by openjdk bot

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Sep 7, 2020

openjdk bot commented Sep 7, 2020

marschall commented Sep 7, 2020

bridgekeeper bot commented Sep 7, 2020

mlbridge bot commented Sep 7, 2020 • edited

Webrevs

AlanBateman commented Sep 7, 2020

dholmes-ora left a comment

Choose a reason for hiding this comment

openjdk bot commented Sep 8, 2020 • edited

mlbridge bot commented Sep 8, 2020

mlbridge bot commented Sep 9, 2020

vnkozlov commented Sep 11, 2020

openjdk bot commented Sep 11, 2020

vnkozlov commented Sep 11, 2020

vnkozlov commented Sep 11, 2020

mlbridge bot commented Sep 23, 2020

mlbridge bot commented Sep 23, 2020

vnkozlov left a comment

Choose a reason for hiding this comment

vnkozlov commented Sep 23, 2020

marschall commented Sep 27, 2020

openjdk bot commented Sep 27, 2020

marschall commented Sep 28, 2020

vnkozlov commented Sep 30, 2020

vnkozlov commented Sep 30, 2020

openjdk bot commented Sep 30, 2020

marschall commented Sep 7, 2020 •

edited by openjdk bot

mlbridge bot commented Sep 7, 2020 •

edited

openjdk bot commented Sep 8, 2020 •

edited