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

8224509: Incorrect alignment in CDS related allocation code on 32-bit platforms #476

Closed
wants to merge 3 commits into from

Conversation

calvinccheung
Copy link
Member

@calvinccheung calvinccheung commented Oct 1, 2020

CDS aligns pointers and sizes to BytesPerWord. On 64-bit, BytesPerWord = 8. On 32-bit, BytesPerWord = 4.

To make the alignment consistent between 64- and 32-bit platforms, this patch changes the alignment value to 8.

Testing: tiers 1 - 4
built linux-x86-debug.


Progress

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

Issue

  • JDK-8224509: Incorrect alignment in CDS related allocation code on 32-bit platforms

Reviewers

Download

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

@calvinccheung
Copy link
Member Author

/label remove hotspot

@calvinccheung
Copy link
Member Author

/label add hotspot-runtime

@calvinccheung calvinccheung marked this pull request as ready for review October 1, 2020 22:41
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 1, 2020

👋 Welcome back ccheung! 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 Oct 1, 2020
@openjdk
Copy link

openjdk bot commented Oct 1, 2020

@calvinccheung The hotspot label was not set.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Oct 1, 2020
@openjdk
Copy link

openjdk bot commented Oct 1, 2020

@calvinccheung
The hotspot-runtime label was successfully added.

@mlbridge
Copy link

mlbridge bot commented Oct 1, 2020

Webrevs

src/hotspot/share/memory/archiveUtils.hpp Outdated Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented Oct 2, 2020

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

8224509: Incorrect alignment in CDS related allocation code on 32-bit platforms

Reviewed-by: iklam, stuefe

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

  • d296708: 8253606: Need to add missed constructor to the SwingEventMonitor
  • 5810238: 8253945: Missed default constructor for StreamPrintServiceFactory.java
  • 123e786: 8239105: Add exception for expiring Digicert root certificates to VerifyCACerts test
  • 22f0916: 8253938: ZGC: Clean up argument names after JDK-8253030
  • 7778047: 8253736: Cleanup some of WorkArounds and usage thereof
  • 87d77eb: 8253879: Simplify redundant code in IndexBuilder

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.

➡️ 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 Oct 2, 2020
Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

Just a drive by comment. Otherwise looks good to my non-CDS-eyes.

src/hotspot/share/memory/archiveUtils.hpp Outdated Show resolved Hide resolved
@calvinccheung
Copy link
Member Author

/comment Set CDS alignment to KlassAlignmentInBytes.

@openjdk
Copy link

openjdk bot commented Oct 5, 2020

@calvinccheung Unknown command comment - for a list of valid commands use /help.

@calvinccheung
Copy link
Member Author

/integrate

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

openjdk bot commented Oct 5, 2020

@calvinccheung Since your change was applied there have been 14 commits pushed to the master branch:

  • 4d29116: 8253433: Remove -XX:+Debugging product option
  • 81dae70: 8253948: Memory leak in ImageFileReader
  • 65cab55: 8253971: ZGC: Flush mark stacks after processing concurrent roots
  • 19219a9: 8253960: Memory leak in Java_java_lang_ClassLoader_defineClass0()
  • 5d4a135: 8253842: [JVMCI] Allow implicit exception to dispatch to other address in jvmci compilers.
  • 289ae79: 8252998: ModuleWrapper.gmk doesn't consult include path
  • 9604ee8: 8248238: Implementation: JEP 388: Windows AArch64 Support
  • 1c2754b: 8253269: The CheckCommonColors test should provide more info on failure
  • d296708: 8253606: Need to add missed constructor to the SwingEventMonitor
  • 5810238: 8253945: Missed default constructor for StreamPrintServiceFactory.java
  • ... and 4 more: https://git.openjdk.java.net/jdk/compare/dffe9db25c19a7e99d3d35c535197bf7e4c15c8a...master

Your commit was automatically rebased without conflicts.

Pushed as commit ea27a54.

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

@calvinccheung calvinccheung deleted the 8224509 branch October 15, 2020 16:23
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
3 participants