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

8272290: [lworld] Disable CDS if InlineTypePassFieldsAsArgs has changed #526

Conversation

@iklam
Copy link
Member

@iklam iklam commented Aug 10, 2021

If any of the following VM options have different values between CDS dump time and runtime, we cannot load the CDS archive:

  • FlatArrayElementMaxOops
  • FlatArrayElementMaxSize
  • InlineFieldMaxFlatSize
  • InlineTypePassFieldsAsArgs
  • InlineTypeReturnedAsFields

Testing with mach5 tiers 1-2


Progress

  • Change must not contain extraneous whitespace

Issue

  • JDK-8272290: [lworld] Disable CDS if InlineTypePassFieldsAsArgs has changed

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/valhalla pull/526/head:pull/526
$ git checkout pull/526

Update a local copy of the PR:
$ git checkout pull/526
$ git pull https://git.openjdk.java.net/valhalla pull/526/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 526

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/valhalla/pull/526.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 10, 2021

👋 Welcome back iklam! A progress list of the required criteria for merging this PR into lworld 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 openjdk bot commented Aug 10, 2021

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

8272290: [lworld] Disable CDS if InlineTypePassFieldsAsArgs has changed

Reviewed-by: mchung, fparain

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 1 new commit pushed to the lworld branch:

  • f85b10b: 8272307: [lworld] [AArch64] TestCallingConventionC1 test63 and test64 get incorrect result

Please see this link for an up-to-date comparison between the source branch of this pull request and the lworld 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 lworld branch, type /integrate in a new comment.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 10, 2021

Webrevs

@mlchung
Copy link
Member

@mlchung mlchung commented Aug 12, 2021

@ioilam Thanks for fixing this. To give more context, this issue was uncovered when the CDS archive includes primitive classes such as Optional which is converted to a ref-default primitive class. The tests fail when running with CDS sharing enabled but pass when running with -Xshare:off.

This looks fine to me. It'd be good to have someone from the runtime to review it.

Copy link
Collaborator

@fparain fparain left a comment

Looks good to me.

Fred

@iklam
Copy link
Member Author

@iklam iklam commented Aug 16, 2021

Thanks @mlchung and @fparain for the review.
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Aug 16, 2021

Going to push as commit a5516c1.
Since your change was applied there has been 1 commit pushed to the lworld branch:

  • f85b10b: 8272307: [lworld] [AArch64] TestCallingConventionC1 test63 and test64 get incorrect result

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Aug 16, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 16, 2021

@iklam Pushed as commit a5516c1.

💡 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
4 participants