Skip to content

Conversation

@coleenp
Copy link
Contributor

@coleenp coleenp commented Jun 14, 2024

Remove code to not use empty slots in supers.
Tested with tier1-4.


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-8330699: Obsolete -XX:+UseEmptySlotsInSupers (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19720

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 14, 2024

👋 Welcome back coleenp! 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
Copy link

openjdk bot commented Jun 14, 2024

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

8330699: Obsolete -XX:+UseEmptySlotsInSupers

Reviewed-by: shade, fparain, dholmes

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 rfr Pull request is ready for review label Jun 14, 2024
@openjdk
Copy link

openjdk bot commented Jun 14, 2024

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

  • hotspot-runtime

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 hotspot-runtime hotspot-runtime-dev@openjdk.org label Jun 14, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 14, 2024

Webrevs

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Forgot to update special_jvm_flags, I think?
EDIT: Ah no, it should stay to fail cleanly, nevermind.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 14, 2024
@coleenp
Copy link
Contributor Author

coleenp commented Jun 14, 2024

Forgot to update special_jvm_flags, I think?

That's removed when the flag is removed in the next release.

Copy link
Contributor

@fparain fparain left a comment

Choose a reason for hiding this comment

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

LGTM
Thank you for the removal of this code.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Looks good. But the flag table entry in arguments.cpp should be moved from the deprecated section to the obsolete section. Also the test

./test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java

needs updating.

Thanks.

@coleenp
Copy link
Contributor Author

coleenp commented Jun 17, 2024

There's no mention of this option in the VMDeprecatedOptions.java test. It was removed in:
8330182: Start of release updates for JDK 24

@dholmes-ora
Copy link
Member

There's no mention of this option in the VMDeprecatedOptions.java test. It was removed in: 8330182: Start of release updates for JDK 24

Sorry my bad. I was looking in an out-of-date branch

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Thanks for the update. Sorry for the delay.

@openjdk
Copy link

openjdk bot commented Jun 18, 2024

@coleenp 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 supers
git fetch https://git.openjdk.org/jdk.git 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 Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Jun 18, 2024
@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 Jun 18, 2024
@coleenp
Copy link
Contributor Author

coleenp commented Jun 20, 2024

Thank you Aleksey, Fred and David.
/integrate

@openjdk
Copy link

openjdk bot commented Jun 20, 2024

Going to push as commit 4b4a483.
Since your change was applied there have been 29 commits pushed to the master branch:

  • 187710e: 8333300: [JVMCI] add support for generational ZGC
  • de8ee97: 8334333: MissingResourceCauseTestRun.java fails if run by root
  • 265a0f5: 8334490: Normalize string with locale invariant toLowerCase()
  • 1b1dba8: 8333358: java/io/IO/IO.java test fails intermittently
  • a81e1bf: 8332252: Clean up vmTestbase/vm/share
  • 99e4d77: 8333117: Remove support of remote and manual debuggee launchers
  • 9ef86da: 8334170: bug6492108.java test failed with exception Image comparison failed at (0, 0) for image 4
  • 001d686: 8332587: RISC-V: secondary_super_cache does not scale well
  • 5cad0b4: 8322708: Global HTML attributes are not allowed
  • 6420846: 8334396: RISC-V: verify perf of ReverseBytesI/L
  • ... and 19 more: https://git.openjdk.org/jdk/compare/e965d70a7425bec78620a2ca8bfaca3c392edf6a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 20, 2024

@coleenp Pushed as commit 4b4a483.

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

@coleenp coleenp deleted the supers branch June 20, 2024 19:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

5 participants