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.

Sign up for GitHub

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

Jump to bottom

8297445: PPC64: Represent Registers as values #11297

Closed
wants to merge 2 commits into from
Closed

8297445: PPC64: Represent Registers as values #11297

wants to merge 2 commits into from

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Nov 22, 2022 •
edited by openjdk bot
Loading

The recent Register implementation uses wild pointer (including null pointer) dereferences which exhibit undefined behavior. We should migrate away from pointer-based representation of Register values as it was done for x86 (JDK-8292153). Problems exist when trying to build with GCC 11 (JDK-8297426).
Note: Implicit conversion from intptr_t to RegisterOrConstant is no longer supported. That's why I had to replace some add instructions.

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11297

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 22, 2022

👋 Welcome back mdoerr! 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 22, 2022
@openjdk
Copy link

openjdk bot commented Nov 22, 2022

@TheRealMDoerr 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 22, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 22, 2022 •
edited
Loading

Webrevs

MBaesken
MBaesken approved these changes Nov 23, 2022
View reviewed changes
Copy link
Member

@MBaesken MBaesken 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 to me and fixes the issue I reported (https://bugs.openjdk.org/browse/JDK-8297426).
You might want to check the SAP copyright header lines in some of the files.

@openjdk
Copy link

openjdk bot commented Nov 23, 2022 •
edited
Loading

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

8297445: PPC64: Represent Registers as values

Reviewed-by: mbaesken, rrich

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 28 new commits pushed to 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.

➡️ 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 23, 2022
reinrich
reinrich approved these changes Nov 23, 2022
View reviewed changes
Copy link
Member

@reinrich reinrich left a comment

Choose a reason for hiding this comment

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

Clean as a whistle :)
Thanks, Richard.

src/hotspot/cpu/ppc/register_ppc.hpp
constexpr Register(int encoding = -1) : _encoding(encoding) {}
bool operator==(const Register rhs) const { return _encoding == rhs._encoding; }
bool operator!=(const Register rhs) const { return _encoding != rhs._encoding; }
const Register* operator->() const { return this; }
Copy link
Member

Choose a reason for hiding this comment

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

This is clever! Personally I'd be in favor of removing it in a cleanup change for simplicity.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, it's also used in shared code (e.g. FrameMap::regname()) so cleanup is only possible after all ports represent Registers as values.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Correct. I think this should get done at some point of time.

@TheRealMDoerr
Copy link
Contributor Author

Thanks for the reviews!

@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 24, 2022

Going to push as commit 9c77e41.
Since your change was applied there have been 32 commits pushed to the master branch:

  • 2f8a5c2: 8297480: GetPrimitiveArrayCritical in imageioJPEG misses result - NULL check
  • abeddab: 6528710: sRGB-ColorSpace to sRGB-ColorSpace Conversion
  • 09ac9eb: 8297533: ProblemList java/io/File/TempDirDoesNotExist.java test failing on windows-x64
  • 5325145: 8297529: ProblemList javax/swing/JFileChooser/8046391/bug8046391.java on windows-x64
  • 91cd8a0: 8297525: jdk/jshell/ToolBasicTest.java fails after JDK-8295984
  • 6dc4d89: 7181214: Need specify SKF translateKey(SecurityKey) method requires instance of PBEKey for PBKDF2 algorithms
  • 2afb4c3: 8297338: JFR: RemoteRecordingStream doesn't respect setMaxAge and setMaxSize
  • 8df3bc4: 8290313: Produce warning when user specified java.io.tmpdir directory doesn't exist
  • 086763a: 8297154: Improve safepoint cleanup logging
  • e6e57fe: 8297507: Update header after JDK-8297230
  • ... and 22 more: https://git.openjdk.org/jdk/compare/42c2037429a8ee6f683bbbc99fb48c540519524c...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 24, 2022
@openjdk openjdk bot closed this Nov 24, 2022
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Nov 24, 2022
@TheRealMDoerr TheRealMDoerr deleted the 8297445_PPC64_Register_classes branch November 24, 2022 08:35
@openjdk openjdk bot removed the rfr Pull request is ready for review label Nov 24, 2022
@openjdk
Copy link

openjdk bot commented Nov 24, 2022

@TheRealMDoerr Pushed as commit 9c77e41.

💡 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
Reviewers

@reinrich reinrich reinrich approved these changes

@MBaesken MBaesken MBaesken approved these changes

Assignees
No one assigned
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TheRealMDoerr @MBaesken @reinrich