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

8297830: aarch64: Make Address a discriminated union internally #11429

Closed
wants to merge 2 commits into from

Conversation

kimbarrett
Copy link

@kimbarrett kimbarrett commented Nov 30, 2022

Please review this change to the aarch64 Address class. It now uses an
internal union, separating the literal and nonliteral cases.

This avoids leaving some fields uninitialized or initializing them to dummy
values. It also reduces the size of the Address class somewhat, though it's
unclear whether that makes any noticeable difference.

Testing:
mach5 tier1 for linux-aarch64 and macosx-aarch64
mach5 tier2-5 for linux-aarch64


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-8297830: aarch64: Make Address a discriminated union internally

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11429

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 30, 2022

👋 Welcome back kbarrett! 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 Nov 30, 2022
@openjdk
Copy link

openjdk bot commented Nov 30, 2022

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

  • hotspot

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 hotspot-dev@openjdk.org label Nov 30, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 30, 2022

Webrevs

Copy link
Contributor

@theRealAph theRealAph left a comment

Choose a reason for hiding this comment

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

OK, thanks. It does seem to me a bit like moving the furniture around, but I have to admit it's an improvement. :-)

@openjdk
Copy link

openjdk bot commented Nov 30, 2022

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

8297830: aarch64: Make Address a discriminated union internally

Reviewed-by: aph, dcubed

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 ready Pull request is ready to be integrated label Nov 30, 2022
@kimbarrett
Copy link
Author

OK, thanks. It does seem to me a bit like moving the furniture around, but I have to admit it's an improvement. :-)

The driver for all these cleanups around aarch64 Address is that when I tried to fix JDK-8160404 I got (valid) compiler warnings here about UB.

@dcubed-ojdk
Copy link
Member

s/descriminated/discriminated/

Use "/issue JDK-8297830" to update the PR title... or just do the single char fix.

Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

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

Thumbs up. A lot of small touches all over assembler_aarch64.hpp
but the result is definitely cleaner...

@kimbarrett kimbarrett changed the title 8297830: aarch64: Make Address a descriminated union internally 8297830: aarch64: Make Address a discriminated union internally Nov 30, 2022
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed ready Pull request is ready to be integrated labels Nov 30, 2022
@theRealAph
Copy link
Contributor

The driver for all these cleanups around aarch64 Address is that when I tried to fix JDK-8160404 I got (valid) compiler warnings here about UB.

Aha! Thanks. It's good to have that here, in the discussion.

@kimbarrett
Copy link
Author

Thanks for reviews @theRealAph and @dcubed-ojdk .

@kimbarrett
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 1, 2022

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

  • 391599b: 8297313: Refactor APIs for calculating address of CDS archive heap regions

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 1, 2022

@kimbarrett Pushed as commit 5a5ced3.

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

@kimbarrett kimbarrett deleted the unionize2 branch December 1, 2022 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
3 participants